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, 41 insertions, 39 deletions

diff --git a/Android.bp b/Android.bp
index 3ad4454..5bd32d6 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 3c29f5b..c8bd7db 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,98 +1,96 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
-    {
-      "name": "ZipFuseTest"
-    },
+  "imports": [
     {
-      "name": "apkdmverity.test"
-    },
-    {
-      "name": "authfs_device_test_src_lib"
+      "path": "external/rust/crates/base64"
     },
     {
-      "name": "base64_device_test_tests_decode"
+      "path": "external/rust/crates/bitflags"
     },
     {
-      "name": "base64_device_test_tests_encode"
+      "path": "external/rust/crates/bytes"
     },
     {
-      "name": "base64_device_test_tests_helpers"
+      "path": "external/rust/crates/either"
     },
     {
-      "name": "either_device_test_src_lib"
+      "path": "external/rust/crates/rand_chacha"
     },
     {
-      "name": "keystore2_test"
+      "path": "external/rust/crates/serde"
     },
     {
-      "name": "keystore2_test_utils_test"
+      "path": "external/rust/crates/serde-xml-rs"
     },
     {
-      "name": "legacykeystore_test"
+      "path": "external/rust/crates/serde_cbor"
     },
     {
-      "name": "microdroid_manager_test"
+      "path": "external/rust/crates/slab"
     },
     {
-      "name": "serde-xml-rs_device_test_src_lib"
+      "path": "external/rust/crates/tinytemplate"
     },
     {
-      "name": "serde_cbor_device_test_src_lib"
+      "path": "external/rust/crates/tinyvec"
     },
     {
-      "name": "serde_cbor_device_test_tests_bennofs"
+      "path": "external/rust/crates/unicode-bidi"
     },
     {
-      "name": "serde_cbor_device_test_tests_canonical"
+      "path": "external/rust/crates/unicode-xid"
     },
     {
-      "name": "serde_cbor_device_test_tests_de"
-    },
+      "path": "external/rust/crates/url"
+    }
+  ],
+  "presubmit": [
     {
-      "name": "serde_cbor_device_test_tests_enum"
+      "name": "ZipFuseTest"
     },
     {
-      "name": "serde_cbor_device_test_tests_ser"
+      "name": "apkdmverity.test"
     },
     {
-      "name": "serde_cbor_device_test_tests_std_types"
+      "name": "authfs_device_test_src_lib"
     },
     {
-      "name": "serde_cbor_device_test_tests_tags"
+      "name": "keystore2_test"
     },
     {
-      "name": "serde_cbor_device_test_tests_value"
+      "name": "keystore2_test_utils_test"
     },
     {
-      "name": "serde_test_device_test_src_lib"
+      "name": "legacykeystore_test"
     },
     {
-      "name": "slab_device_test_src_lib"
+      "name": "microdroid_manager_test"
     },
     {
-      "name": "slab_device_test_tests_serde"
-    },
+      "name": "virtualizationservice_device_test"
+    }
+  ],
+  "presubmit-rust": [
     {
-      "name": "slab_device_test_tests_slab"
+      "name": "ZipFuseTest"
     },
     {
-      "name": "unicode-bidi_device_test_src_lib"
+      "name": "apkdmverity.test"
     },
     {
-      "name": "unicode-xid_device_test_src_lib"
+      "name": "authfs_device_test_src_lib"
     },
     {
-      "name": "unicode-xid_device_test_tests_exhaustive_tests"
+      "name": "keystore2_test"
     },
     {
-      "name": "url_device_test_src_lib"
+      "name": "keystore2_test_utils_test"
     },
     {
-      "name": "url_device_test_tests_data"
+      "name": "legacykeystore_test"
     },
     {
-      "name": "url_device_test_tests_unit"
+      "name": "microdroid_manager_test"
     },
     {
       "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