diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 17:27:38 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 17:27:38 +0000 |
commit | 17362a02d848d6ca8a7c2a8f794aed171a55c92c (patch) | |
tree | 1827ab1859819ce00930d791c74fe7ad21b142b9 | |
parent | 9d316f29c6d3a0c0b3c167268a6d4603b6a5585d (diff) | |
parent | c3f69300dfa48933d2cd36c017a1f16c903fa050 (diff) | |
download | scopeguard-17362a02d848d6ca8a7c2a8f794aed171a55c92c.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: c5fbe2e30e am: f4ae804b8d am: c3f69300df
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/1912813
Change-Id: Icb4be9ffb3bcd11ec1bdace7005d7c6923b08fca
-rw-r--r-- | Android.bp | 23 | ||||
-rw-r--r-- | TEST_MAPPING | 35 |
2 files changed, 31 insertions, 27 deletions
@@ -56,30 +56,21 @@ rust_library { ], } -rust_defaults { - name: "scopeguard_test_defaults", +rust_test { + name: "scopeguard_test_src_lib", + host_supported: true, crate_name: "scopeguard", - srcs: ["src/lib.rs"], cargo_env_compat: true, cargo_pkg_version: "1.1.0", + srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2015", features: [ "default", "use_std", ], } - -rust_test_host { - name: "scopeguard_host_test_src_lib", - defaults: ["scopeguard_test_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "scopeguard_device_test_src_lib", - defaults: ["scopeguard_test_defaults"], -} diff --git a/TEST_MAPPING b/TEST_MAPPING index f070c13..af52a19 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,35 +1,48 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ + "imports": [ { - "name": "apkdmverity.test" + "path": "external/rust/crates/base64" }, { - "name": "base64_device_test_tests_decode" + "path": "external/rust/crates/crossbeam-deque" }, { - "name": "base64_device_test_tests_encode" + "path": "external/rust/crates/crossbeam-epoch" }, { - "name": "base64_device_test_tests_helpers" + "path": "external/rust/crates/tinytemplate" }, { - "name": "crossbeam-epoch_device_test_src_lib" + "path": "external/rust/crates/tinyvec" }, { - "name": "crossbeam-epoch_device_test_tests_loom" + "path": "external/rust/crates/unicode-xid" }, { - "name": "lock_api_device_test_src_lib" + "path": "external/rust/crates/vulkano" + } + ], + "presubmit": [ + { + "name": "ZipFuseTest" }, { - "name": "scopeguard_device_test_src_lib" + "name": "apkdmverity.test" }, { - "name": "unicode-xid_device_test_src_lib" + "name": "scopeguard_test_src_lib" + } + ], + "presubmit-rust": [ + { + "name": "ZipFuseTest" + }, + { + "name": "apkdmverity.test" }, { - "name": "unicode-xid_device_test_tests_exhaustive_tests" + "name": "scopeguard_test_src_lib" } ] } |