Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."
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,5 +1,49 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/base64"
+ },
+ {
+ "path": "external/rust/crates/bitflags"
+ },
+ {
+ "path": "external/rust/crates/bytes"
+ },
+ {
+ "path": "external/rust/crates/either"
+ },
+ {
+ "path": "external/rust/crates/rand_chacha"
+ },
+ {
+ "path": "external/rust/crates/serde"
+ },
+ {
+ "path": "external/rust/crates/serde-xml-rs"
+ },
+ {
+ "path": "external/rust/crates/serde_cbor"
+ },
+ {
+ "path": "external/rust/crates/slab"
+ },
+ {
+ "path": "external/rust/crates/tinytemplate"
+ },
+ {
+ "path": "external/rust/crates/tinyvec"
+ },
+ {
+ "path": "external/rust/crates/unicode-bidi"
+ },
+ {
+ "path": "external/rust/crates/unicode-xid"
+ },
+ {
+ "path": "external/rust/crates/url"
+ }
+ ],
"presubmit": [
{
"name": "ZipFuseTest"
@@ -11,18 +55,6 @@
"name": "authfs_device_test_src_lib"
},
{
- "name": "base64_device_test_tests_decode"
- },
- {
- "name": "base64_device_test_tests_encode"
- },
- {
- "name": "base64_device_test_tests_helpers"
- },
- {
- "name": "either_device_test_src_lib"
- },
- {
"name": "keystore2_test"
},
{
@@ -35,64 +67,30 @@
"name": "microdroid_manager_test"
},
{
- "name": "serde-xml-rs_device_test_src_lib"
+ "name": "virtualizationservice_device_test"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "ZipFuseTest"
},
{
- "name": "serde_cbor_device_test_src_lib"
+ "name": "apkdmverity.test"
},
{
- "name": "serde_cbor_device_test_tests_bennofs"
+ "name": "authfs_device_test_src_lib"
},
{
- "name": "serde_cbor_device_test_tests_canonical"
+ "name": "keystore2_test"
},
{
- "name": "serde_cbor_device_test_tests_de"
+ "name": "keystore2_test_utils_test"
},
{
- "name": "serde_cbor_device_test_tests_enum"
+ "name": "legacykeystore_test"
},
{
- "name": "serde_cbor_device_test_tests_ser"
- },
- {
- "name": "serde_cbor_device_test_tests_std_types"
- },
- {
- "name": "serde_cbor_device_test_tests_tags"
- },
- {
- "name": "serde_cbor_device_test_tests_value"
- },
- {
- "name": "serde_test_device_test_src_lib"
- },
- {
- "name": "slab_device_test_src_lib"
- },
- {
- "name": "slab_device_test_tests_serde"
- },
- {
- "name": "slab_device_test_tests_slab"
- },
- {
- "name": "unicode-bidi_device_test_src_lib"
- },
- {
- "name": "unicode-xid_device_test_src_lib"
- },
- {
- "name": "unicode-xid_device_test_tests_exhaustive_tests"
- },
- {
- "name": "url_device_test_src_lib"
- },
- {
- "name": "url_device_test_tests_data"
- },
- {
- "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
