commit 85654f1575eca567ed168fd35d3f98928fc59187
author Linux Build Service Account <lnxbuild@localhost> Wed Feb 16 21:41:52 2022 -0800
committer Linux Build Service Account <lnxbuild@localhost> Wed Feb 16 21:41:52 2022 -0800
tree cd6fa53d5a269f809a52f02063fdcd08b89e3ff0
parent c06945b4721253ec3b771f801838c077918bb657
parent ddf2cd2b412e2700c73905d82beda7155f560ea4

Merge ddf2cd2b412e2700c73905d82beda7155f560ea4 on remote branch

Change-Id: If37d5c74f6ad958712f9756f238e031c98826592

Android.bp

diff --git a/Android.bp b/Android.bp
index 4a21761..d7d1318 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,6 +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 85afab5..ceee8b5 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,11 +1,14 @@
 {
   "apex-available": [
     "//apex_available:platform",
+    "com.android.bluetooth",
+    "com.android.compos",
     "com.android.virt"
   ],
   "copy-out": true,
   "dependencies": true,
   "device": true,
   "features": "bytes",
+  "min-sdk-version": "29",
   "run": true
-}
\ No newline at end of file
+}