Refresh Android.bp, cargo2android.json, TEST_MAPPING.

Test: None
Change-Id: Ie5620066a38dc70c56556d68718943943c8115aa

1 files changed, 58 insertions, 69 deletions

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 8a6ab1e..0166f1d 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,107 +1,123 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
+  "imports": [
     {
-      "name": "android_logger_device_test_src_lib"
+      "path": "external/rust/crates/android_logger"
     },
     {
-      "name": "android_logger_device_test_tests_config_log_level"
+      "path": "external/rust/crates/base64"
     },
     {
-      "name": "android_logger_device_test_tests_default_init"
+      "path": "external/rust/crates/crossbeam-deque"
     },
     {
-      "name": "android_logger_device_test_tests_multiple_init"
+      "path": "external/rust/crates/crossbeam-epoch"
     },
     {
-      "name": "authfs_device_test_src_lib"
+      "path": "external/rust/crates/crossbeam-queue"
     },
     {
-      "name": "base64_device_test_tests_decode"
+      "path": "external/rust/crates/crossbeam-utils"
     },
     {
-      "name": "base64_device_test_tests_encode"
+      "path": "external/rust/crates/jni"
     },
     {
-      "name": "base64_device_test_tests_helpers"
+      "path": "external/rust/crates/libsqlite3-sys"
     },
     {
-      "name": "crossbeam-epoch_device_test_src_lib"
+      "path": "external/rust/crates/once_cell"
     },
     {
-      "name": "crossbeam-epoch_device_test_tests_loom"
+      "path": "external/rust/crates/quiche"
     },
     {
-      "name": "crossbeam-utils_device_test_src_lib"
+      "path": "external/rust/crates/regex"
     },
     {
-      "name": "crossbeam-utils_device_test_tests_atomic_cell"
+      "path": "external/rust/crates/shared_library"
     },
     {
-      "name": "crossbeam-utils_device_test_tests_cache_padded"
+      "path": "external/rust/crates/tinytemplate"
     },
     {
-      "name": "crossbeam-utils_device_test_tests_parker"
+      "path": "external/rust/crates/tinyvec"
     },
     {
-      "name": "crossbeam-utils_device_test_tests_sharded_lock"
+      "path": "external/rust/crates/unicode-xid"
     },
     {
-      "name": "crossbeam-utils_device_test_tests_thread"
+      "path": "external/rust/crates/vulkano"
     },
     {
-      "name": "crossbeam-utils_device_test_tests_wait_group"
+      "path": "external/rust/crates/xml-rs"
+    }
+  ],
+  "presubmit": [
+    {
+      "name": "authfs_device_test_src_lib"
     },
     {
       "name": "doh_unit_test"
     },
     {
-      "name": "jni_device_test_src_lib"
+      "name": "keystore2_km_compat_test"
+    },
+    {
+      "name": "keystore2_selinux_concurrency_test"
+    },
+    {
+      "name": "keystore2_selinux_test"
     },
     {
-      "name": "jni_device_test_tests_executor"
+      "name": "keystore2_test"
     },
     {
-      "name": "jni_device_test_tests_executor_nested_attach"
+      "name": "keystore2_test_utils_test"
     },
     {
-      "name": "jni_device_test_tests_java_integers"
+      "name": "lazy_static_test_tests_test"
     },
     {
-      "name": "jni_device_test_tests_jmap"
+      "name": "legacykeystore_test"
     },
     {
-      "name": "jni_device_test_tests_jni_api"
+      "name": "libapkverify.integration_test"
     },
     {
-      "name": "jni_device_test_tests_jni_global_refs"
+      "name": "libapkverify.test"
     },
     {
-      "name": "jni_device_test_tests_threads_attach_guard"
+      "name": "logger_device_unit_tests"
     },
     {
-      "name": "jni_device_test_tests_threads_detach"
+      "name": "logger_test_config_log_level"
     },
     {
-      "name": "jni_device_test_tests_threads_detach_daemon"
+      "name": "logger_test_default_init"
     },
     {
-      "name": "jni_device_test_tests_threads_explicit_detach"
+      "name": "logger_test_env_log_level"
     },
     {
-      "name": "jni_device_test_tests_threads_explicit_detach_daemon"
+      "name": "logger_test_multiple_init"
     },
     {
-      "name": "jni_device_test_tests_threads_explicit_detach_permanent"
+      "name": "microdroid_manager_test"
     },
     {
-      "name": "jni_device_test_tests_threads_nested_attach_daemon"
+      "name": "open_then_run_module"
     },
     {
-      "name": "jni_device_test_tests_threads_nested_attach_guard"
+      "name": "virtualizationservice_device_test"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "authfs_device_test_src_lib"
     },
     {
-      "name": "jni_device_test_tests_threads_nested_attach_permanently"
+      "name": "doh_unit_test"
     },
     {
       "name": "keystore2_km_compat_test"
@@ -116,10 +132,10 @@
       "name": "keystore2_test"
     },
     {
-      "name": "lazy_static_device_test_src_lib"
+      "name": "keystore2_test_utils_test"
     },
     {
-      "name": "lazy_static_device_test_tests_test"
+      "name": "lazy_static_test_tests_test"
     },
     {
       "name": "legacykeystore_test"
@@ -131,55 +147,28 @@
       "name": "libapkverify.test"
     },
     {
-      "name": "libsqlite3-sys_device_test_src_lib"
-    },
-    {
-      "name": "libsqlite3_bindgen_test"
-    },
-    {
-      "name": "logger_device_test_config_log_level"
+      "name": "logger_device_unit_tests"
     },
     {
-      "name": "logger_device_test_default_init"
+      "name": "logger_test_config_log_level"
     },
     {
-      "name": "logger_device_test_env_log_level"
+      "name": "logger_test_default_init"
     },
     {
-      "name": "logger_device_test_multiple_init"
+      "name": "logger_test_env_log_level"
     },
     {
-      "name": "logger_device_unit_tests"
+      "name": "logger_test_multiple_init"
     },
     {
       "name": "microdroid_manager_test"
     },
     {
-      "name": "quiche_device_test_src_lib"
-    },
-    {
-      "name": "unicode-xid_device_test_src_lib"
-    },
-    {
-      "name": "unicode-xid_device_test_tests_exhaustive_tests"
+      "name": "open_then_run_module"
     },
     {
       "name": "virtualizationservice_device_test"
-    },
-    {
-      "name": "xml-rs_device_test_src_analyze"
-    },
-    {
-      "name": "xml-rs_device_test_src_lib"
-    },
-    {
-      "name": "xml-rs_device_test_tests_event_reader"
-    },
-    {
-      "name": "xml-rs_device_test_tests_event_writer"
-    },
-    {
-      "name": "xml-rs_device_test_tests_streaming"
     }
   ]
 }