diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:43:24 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:43:24 +0000 |
commit | e1a246a985d841a06f9d0eb00140c3fc68b694aa (patch) | |
tree | 02538b4aeafe8bc641d6734a9b3d9141572cb9a3 | |
parent | 199b724b6942565dc1e489362c0cf06ea9737bb0 (diff) | |
parent | b340e65226123456a297da97efc5b9f45ad01384 (diff) | |
download | thiserror-impl-e1a246a985d841a06f9d0eb00140c3fc68b694aa.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 91dcd9888d am: b340e65226
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1912689
Change-Id: I529491ff85c84eafa2ef801531f678c1fca56559
-rw-r--r-- | Android.bp | 2 | ||||
-rw-r--r-- | TEST_MAPPING | 80 | ||||
-rw-r--r-- | cargo2android.json | 4 |
3 files changed, 35 insertions, 51 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 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 |