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

3 files changed, 35 insertions, 55 deletions

diff --git a/Android.bp b/Android.bp
index 226e160..cc2e6d6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -40,7 +40,6 @@ license {
 rust_library {
     name: "libthiserror",
     host_supported: true,
-    vendor_available: true,
     crate_name: "thiserror",
     cargo_env_compat: true,
     cargo_pkg_version: "1.0.29",
@@ -54,5 +53,6 @@ rust_library {
         "com.android.uwb",
         "com.android.virt",
     ],
+    vendor_available: true,
     min_sdk_version: "29",
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 35b2201..ec89789 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,44 +1,19 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
-    {
-      "name": "ZipFuseTest"
-    },
-    {
-      "name": "anyhow_device_test_src_lib"
-    },
-    {
-      "name": "anyhow_device_test_tests_test_autotrait"
-    },
-    {
-      "name": "anyhow_device_test_tests_test_boxed"
-    },
-    {
-      "name": "anyhow_device_test_tests_test_chain"
-    },
-    {
-      "name": "anyhow_device_test_tests_test_context"
-    },
-    {
-      "name": "anyhow_device_test_tests_test_convert"
-    },
-    {
-      "name": "anyhow_device_test_tests_test_downcast"
-    },
-    {
-      "name": "anyhow_device_test_tests_test_ffi"
-    },
+  "imports": [
     {
-      "name": "anyhow_device_test_tests_test_fmt"
+      "path": "external/rust/crates/anyhow"
     },
     {
-      "name": "anyhow_device_test_tests_test_macros"
+      "path": "external/rust/crates/jni"
     },
     {
-      "name": "anyhow_device_test_tests_test_repr"
-    },
+      "path": "external/rust/crates/serde-xml-rs"
+    }
+  ],
+  "presubmit": [
     {
-      "name": "anyhow_device_test_tests_test_source"
+      "name": "ZipFuseTest"
     },
     {
       "name": "apkdmverity.test"
@@ -47,52 +22,57 @@
       "name": "authfs_device_test_src_lib"
     },
     {
-      "name": "jni_device_test_src_lib"
+      "name": "doh_unit_test"
     },
     {
-      "name": "jni_device_test_tests_executor"
+      "name": "keystore2_crypto_test_rust"
     },
     {
-      "name": "jni_device_test_tests_executor_nested_attach"
+      "name": "keystore2_selinux_concurrency_test"
     },
     {
-      "name": "jni_device_test_tests_java_integers"
+      "name": "keystore2_selinux_test"
     },
     {
-      "name": "jni_device_test_tests_jmap"
+      "name": "keystore2_test"
     },
     {
-      "name": "jni_device_test_tests_jni_api"
+      "name": "keystore2_test_utils_test"
     },
     {
-      "name": "jni_device_test_tests_jni_global_refs"
+      "name": "keystore2_vintf_test"
     },
     {
-      "name": "jni_device_test_tests_threads_attach_guard"
+      "name": "legacykeystore_test"
     },
     {
-      "name": "jni_device_test_tests_threads_detach"
+      "name": "libapkverify.integration_test"
     },
     {
-      "name": "jni_device_test_tests_threads_detach_daemon"
+      "name": "libapkverify.test"
     },
     {
-      "name": "jni_device_test_tests_threads_explicit_detach"
+      "name": "microdroid_manager_test"
     },
     {
-      "name": "jni_device_test_tests_threads_explicit_detach_daemon"
+      "name": "open_then_run_module"
     },
     {
-      "name": "jni_device_test_tests_threads_explicit_detach_permanent"
+      "name": "virtualizationservice_device_test"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "ZipFuseTest"
     },
     {
-      "name": "jni_device_test_tests_threads_nested_attach_daemon"
+      "name": "apkdmverity.test"
     },
     {
-      "name": "jni_device_test_tests_threads_nested_attach_guard"
+      "name": "authfs_device_test_src_lib"
     },
     {
-      "name": "jni_device_test_tests_threads_nested_attach_permanently"
+      "name": "doh_unit_test"
     },
     {
       "name": "keystore2_crypto_test_rust"
@@ -125,7 +105,7 @@
       "name": "microdroid_manager_test"
     },
     {
-      "name": "serde-xml-rs_device_test_src_lib"
+      "name": "open_then_run_module"
     },
     {
       "name": "virtualizationservice_device_test"
diff --git a/cargo2android.json b/cargo2android.json
index 8d63324..968e19b 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -8,7 +8,7 @@
   ],
   "dependencies": true,
   "device": true,
-  "min_sdk_version": "29",
-  "vendor_available": true,
-  "run": true
-}
+  "min-sdk-version": "29",
+  "run": true,
+  "vendor-available": true
+}
\ No newline at end of file