Snap for 8183730 from bcbb2293e68b7ea9e451b4af2b3c5474708b6f59 to udc-release

Change-Id: Id80a1cf5c92d75bc234c2b185f1a6773b6193f43

3 files changed, 30 insertions, 2 deletions

diff --git a/Android.bp b/Android.bp
index 7a42765..f7fbc23 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,10 +41,14 @@ rust_library {
     name: "libsmallvec",
     host_supported: true,
     crate_name: "smallvec",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.6.1",
     srcs: ["src/lib.rs"],
     edition: "2018",
     apex_available: [
         "//apex_available:platform",
+        "com.android.bluetooth",
         "com.android.virt",
     ],
+    min_sdk_version: "29",
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 2fb101e..713deb2 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,5 +1,13 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "external/rust/crates/parking_lot_core"
+    },
+    {
+      "path": "external/rust/crates/vulkano"
+    }
+  ],
   "presubmit": [
     {
       "name": "ZipFuseTest"
@@ -14,7 +22,21 @@
       "name": "legacykeystore_test"
     },
     {
-      "name": "parking_lot_core_device_test_src_lib"
+      "name": "virtualizationservice_device_test"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "ZipFuseTest"
+    },
+    {
+      "name": "authfs_device_test_src_lib"
+    },
+    {
+      "name": "keystore2_test"
+    },
+    {
+      "name": "legacykeystore_test"
     },
     {
       "name": "virtualizationservice_device_test"
diff --git a/cargo2android.json b/cargo2android.json
index 42b7833..8159be1 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,9 +1,11 @@
 {
   "apex-available": [
     "//apex_available:platform",
+    "com.android.bluetooth",
     "com.android.virt"
   ],
   "dependencies": true,
   "device": true,
+  "min-sdk-version": "29",
   "run": true
-}
\ No newline at end of file
+}