Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."

2 files changed, 50 insertions, 13 deletions

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 14d93ba..37d7815 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,20 +1,54 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "external/rust/crates/android_logger"
+    }
+  ],
   "presubmit": [
     {
       "name": "ZipFuseTest"
     },
     {
-      "name": "android_logger_device_test_src_lib"
+      "name": "authfs_device_test_src_lib"
+    },
+    {
+      "name": "doh_unit_test"
+    },
+    {
+      "name": "keystore2_selinux_concurrency_test"
+    },
+    {
+      "name": "keystore2_selinux_test"
+    },
+    {
+      "name": "keystore2_test"
+    },
+    {
+      "name": "logger_device_unit_tests"
+    },
+    {
+      "name": "logger_test_config_log_level"
+    },
+    {
+      "name": "logger_test_default_init"
+    },
+    {
+      "name": "logger_test_env_log_level"
     },
     {
-      "name": "android_logger_device_test_tests_config_log_level"
+      "name": "logger_test_multiple_init"
     },
     {
-      "name": "android_logger_device_test_tests_default_init"
+      "name": "open_then_run_module"
     },
     {
-      "name": "android_logger_device_test_tests_multiple_init"
+      "name": "virtualizationservice_device_test"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "ZipFuseTest"
     },
     {
       "name": "authfs_device_test_src_lib"
@@ -32,19 +66,22 @@
       "name": "keystore2_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": "open_then_run_module"
     },
     {
       "name": "virtualizationservice_device_test"
diff --git a/cargo2android.json b/cargo2android.json
index 32b2314..0bfe14a 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -7,9 +7,9 @@
     "com.android.uwb",
     "com.android.virt"
   ],
-  "min_sdk_version": "29",
-  "vendor_available": true,
   "dependencies": true,
   "device": true,
-  "run": true
-}
+  "min-sdk-version": "29",
+  "run": true,
+  "vendor-available": true
+}
\ No newline at end of file