Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1

3 files changed, 35 insertions, 51 deletions

diff --git a/Android.bp b/Android.bp
index b8ead4a..6ef921c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device.
+// This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
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
new file mode 100644
index 0000000..bf78496
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,4 @@
+{
+  "device": true,
+  "run": true
+}
\ No newline at end of file