Refresh Android.bp, cargo2android.json, TEST_MAPPING.

Test: None
Change-Id: I1b627bb8cfed145b7ffbd25c8bee8cfc404cf054

2 files changed, 25 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index 7a42765..4c2cc08 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,6 +41,8 @@ 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: [
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"