Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 89cebdd075 am: 64de7a34b9 am: a0339a2e94 am: 1157fa13dc
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tinyvec_macros/+/1912819
Change-Id: Ie2603aa0fbe4e0a3e3346132cd8eb17c2afdd0ed
diff --git a/Android.bp b/Android.bp
index c2c3631..15ad891 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,6 +37,8 @@
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: [
@@ -45,25 +47,3 @@
],
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 dedf783..15c97a1 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,26 +1,27 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "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": "quiche_device_test_src_lib"
- },
- {
- "name": "tinyvec_macros_device_test_src_lib"
- },
- {
- "name": "unicode-normalization_device_test_src_lib"
- },
- {
- "name": "url_device_test_src_lib"
- },
- {
- "name": "url_device_test_tests_data"
- },
- {
- "name": "url_device_test_tests_unit"
+ "name": "doh_unit_test"
}
]
}
