Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 88d364f35e am: aacd0ca24b

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

Change-Id: Id40d286c659137a0c69387ddf6193656efedf0a4

1 files changed, 26 insertions, 13 deletions

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 74ab9ee..42777bd 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,41 +1,54 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
+  "imports": [
     {
-      "name": "ZipFuseTest"
+      "path": "external/rust/crates/base64"
     },
     {
-      "name": "authfs_device_test_src_lib"
+      "path": "external/rust/crates/bitflags"
     },
     {
-      "name": "base64_device_test_tests_decode"
+      "path": "external/rust/crates/either"
     },
     {
-      "name": "base64_device_test_tests_encode"
+      "path": "external/rust/crates/rand_chacha"
     },
     {
-      "name": "base64_device_test_tests_helpers"
+      "path": "external/rust/crates/tinytemplate"
     },
     {
-      "name": "either_device_test_src_lib"
+      "path": "external/rust/crates/tinyvec"
     },
     {
-      "name": "microdroid_manager_test"
+      "path": "external/rust/crates/unicode-xid"
+    },
+    {
+      "path": "external/rust/crates/url"
+    }
+  ],
+  "presubmit": [
+    {
+      "name": "ZipFuseTest"
     },
     {
-      "name": "unicode-xid_device_test_src_lib"
+      "name": "authfs_device_test_src_lib"
     },
     {
-      "name": "unicode-xid_device_test_tests_exhaustive_tests"
+      "name": "microdroid_manager_test"
     },
     {
-      "name": "url_device_test_src_lib"
+      "name": "virtualizationservice_device_test"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "ZipFuseTest"
     },
     {
-      "name": "url_device_test_tests_data"
+      "name": "authfs_device_test_src_lib"
     },
     {
-      "name": "url_device_test_tests_unit"
+      "name": "microdroid_manager_test"
     },
     {
       "name": "virtualizationservice_device_test"