Snap for 8189365 from a7b8200d042a4b6818d1a17e3a2d9586ef88c821 to tm-frc-scheduling-release
Change-Id: If49ba7ffb2d66060fb5704d13631c31db6718d5c
diff --git a/Android.bp b/Android.bp
index 15ad891..c2c3631 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,8 +37,6 @@
name: "libtinyvec_macros",
host_supported: true,
crate_name: "tinyvec_macros",
- cargo_env_compat: true,
- cargo_pkg_version: "0.1.0",
srcs: ["src/lib.rs"],
edition: "2018",
apex_available: [
@@ -47,3 +45,25 @@
],
min_sdk_version: "29",
}
+
+rust_defaults {
+ name: "tinyvec_macros_defaults",
+ crate_name: "tinyvec_macros",
+ srcs: ["src/lib.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
+ edition: "2018",
+}
+
+rust_test_host {
+ name: "tinyvec_macros_host_test_src_lib",
+ defaults: ["tinyvec_macros_defaults"],
+ test_options: {
+ unit_test: true,
+ },
+}
+
+rust_test {
+ name: "tinyvec_macros_device_test_src_lib",
+ defaults: ["tinyvec_macros_defaults"],
+}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 15c97a1..710401c 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,27 +1,8 @@
-// Generated by update_crate_tests.py for tests that depend on this crate.
+// Generated by cargo2android.py for tests in Android.bp
{
- "imports": [
- {
- "path": "external/rust/crates/quiche"
- },
- {
- "path": "external/rust/crates/tinyvec"
- },
- {
- "path": "external/rust/crates/unicode-normalization"
- },
- {
- "path": "external/rust/crates/url"
- }
- ],
"presubmit": [
{
- "name": "doh_unit_test"
- }
- ],
- "presubmit-rust": [
- {
- "name": "doh_unit_test"
+ "name": "tinyvec_macros_device_test_src_lib"
}
]
}
