Snap for 8006021 from 63bbb70839d1d042e3d72d2451298a94dce028d6 to tm-release
Change-Id: I04a2e3777c45473e15c5dea45452bc7fef605b2f
diff --git a/Android.bp b/Android.bp
index 365c89a..ab89161 100644
--- a/Android.bp
+++ b/Android.bp
@@ -56,30 +56,21 @@
],
}
-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.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/base64"
+ },
+ {
+ "path": "external/rust/crates/crossbeam-deque"
+ },
+ {
+ "path": "external/rust/crates/crossbeam-epoch"
+ },
+ {
+ "path": "external/rust/crates/tinytemplate"
+ },
+ {
+ "path": "external/rust/crates/tinyvec"
+ },
+ {
+ "path": "external/rust/crates/unicode-xid"
+ },
+ {
+ "path": "external/rust/crates/vulkano"
+ }
+ ],
"presubmit": [
{
+ "name": "ZipFuseTest"
+ },
+ {
"name": "apkdmverity.test"
},
{
- "name": "base64_device_test_tests_decode"
+ "name": "scopeguard_test_src_lib"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "ZipFuseTest"
},
{
- "name": "base64_device_test_tests_encode"
+ "name": "apkdmverity.test"
},
{
- "name": "base64_device_test_tests_helpers"
- },
- {
- "name": "crossbeam-epoch_device_test_src_lib"
- },
- {
- "name": "crossbeam-epoch_device_test_tests_loom"
- },
- {
- "name": "lock_api_device_test_src_lib"
- },
- {
- "name": "scopeguard_device_test_src_lib"
- },
- {
- "name": "unicode-xid_device_test_src_lib"
- },
- {
- "name": "unicode-xid_device_test_tests_exhaustive_tests"
+ "name": "scopeguard_test_src_lib"
}
]
}
