Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 88fac7b76f am: dba66ab262 am: 94531d70f6 am: d9237df943

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/either/+/1912601

Change-Id: Ifa7793a06ea2d728e4104ecd54b6649bbbe6d0d7

1 files changed, 23 insertions, 10 deletions

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 359e921..149c80f 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,35 +1,48 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
+  "imports": [
+    {
+      "path": "external/rust/crates/base64"
+    },
     {
-      "name": "base64_device_test_tests_decode"
+      "path": "external/rust/crates/libsqlite3-sys"
     },
     {
-      "name": "base64_device_test_tests_encode"
+      "path": "external/rust/crates/tinytemplate"
     },
     {
-      "name": "base64_device_test_tests_helpers"
+      "path": "external/rust/crates/tinyvec"
+    },
+    {
+      "path": "external/rust/crates/unicode-xid"
+    }
+  ],
+  "presubmit": [
+    {
+      "name": "apkdmverity.test"
     },
     {
-      "name": "either_device_test_src_lib"
+      "name": "either_test_src_lib"
     },
     {
       "name": "keystore2_test"
     },
     {
       "name": "legacykeystore_test"
-    },
+    }
+  ],
+  "presubmit-rust": [
     {
-      "name": "libsqlite3-sys_device_test_src_lib"
+      "name": "apkdmverity.test"
     },
     {
-      "name": "libsqlite3_bindgen_test"
+      "name": "either_test_src_lib"
     },
     {
-      "name": "unicode-xid_device_test_src_lib"
+      "name": "keystore2_test"
     },
     {
-      "name": "unicode-xid_device_test_tests_exhaustive_tests"
+      "name": "legacykeystore_test"
     }
   ]
 }