commit ff96acf4dd9126463b755b25b018161b7d0a88f1
author Scott Lobdell <slobdell@google.com> Sun Jan 30 02:47:56 2022 +0000
committer Scott Lobdell <slobdell@google.com> Sun Jan 30 02:58:37 2022 +0000
tree cd6fa53d5a269f809a52f02063fdcd08b89e3ff0
parent 8e78438f678483135d40fc3760acf1e9acf89c7b
parent c6e248b58bc0927b1a69c56d43a497361ae2e095

Merge TP1A.220107.002

Change-Id: Ia9e6d761e97c0a3978cbaa4db90d103b91d4db11

Android.bp

diff --git a/Android.bp b/Android.bp
index a44204f..d7d1318 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,7 +42,9 @@
     ],
     apex_available: [
         "//apex_available:platform",
+        "com.android.bluetooth",
         "com.android.compos",
         "com.android.virt",
     ],
+    min_sdk_version: "29",
 }

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index ab8f416..b7c1df9 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -7,5 +7,13 @@
     {
       "name": "virtualizationservice_device_test"
     }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "microdroid_manager_test"
+    },
+    {
+      "name": "virtualizationservice_device_test"
+    }
   ]
 }

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
index c983075..ceee8b5 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,6 +1,7 @@
 {
   "apex-available": [
     "//apex_available:platform",
+    "com.android.bluetooth",
     "com.android.compos",
     "com.android.virt"
   ],
@@ -8,5 +9,6 @@
   "dependencies": true,
   "device": true,
   "features": "bytes",
+  "min-sdk-version": "29",
   "run": true
 }