diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 18:07:20 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 18:07:20 +0000 |
commit | aad39d2ca467374c3506c14bc4a8e5ff8d79939e (patch) | |
tree | 27e6a4d749e4d75b72421f0cac7f5037b554775d | |
parent | 2440a5afa4a3697440f905818a9b3ff67038a7c0 (diff) | |
parent | e035a87c8ed2764ff1f62aac6b19ec481e5bae7e (diff) | |
download | serde_derive-aad39d2ca467374c3506c14bc4a8e5ff8d79939e.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: efcb0fde21 am: d6152172a4 am: 9ff4f192f1 am: e035a87c8e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_derive/+/1912832
Change-Id: I7f03b4c70ea469ace340b63fb07e3ac4e60de947
-rw-r--r-- | Android.bp | 2 | ||||
-rw-r--r-- | TEST_MAPPING | 74 | ||||
-rw-r--r-- | cargo2android.json | 4 |
3 files changed, 41 insertions, 39 deletions
@@ -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 |