Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 733e7baa10 am: b07611c07c am: 3c9932ff16 am: 676c379a13
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/matches/+/1912500
Change-Id: I56f3be0e3895e2121f27dba4d696363912c940ab
diff --git a/Android.bp b/Android.bp
index 2811c94..305eede 100644
--- a/Android.bp
+++ b/Android.bp
@@ -34,33 +34,24 @@
min_sdk_version: "29",
}
-rust_defaults {
- name: "matches_test_defaults",
- crate_name: "matches",
+rust_test {
+ name: "matches_test_lib",
// has rustc warnings
- srcs: ["lib.rs"],
+ host_supported: true,
+ crate_name: "matches",
cargo_env_compat: true,
cargo_pkg_version: "0.1.9",
+ srcs: ["lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
- edition: "2015",
-}
-
-rust_test_host {
- name: "matches_host_test_lib",
- defaults: ["matches_test_defaults"],
test_options: {
unit_test: true,
},
-}
-
-rust_test {
- name: "matches_device_test_lib",
- defaults: ["matches_test_defaults"],
+ edition: "2015",
}
rust_defaults {
- name: "matches_test_defaults_matches",
+ name: "matches_test_defaults",
crate_name: "matches",
cargo_env_compat: true,
cargo_pkg_version: "0.1.9",
@@ -72,10 +63,11 @@
],
}
-rust_test_host {
- name: "matches_host_test_tests_macro_use_one",
- defaults: ["matches_test_defaults_matches"],
+rust_test {
+ name: "matches_test_tests_macro_use_one",
+ defaults: ["matches_test_defaults"],
// has rustc warnings
+ host_supported: true,
srcs: ["tests/macro_use_one.rs"],
test_options: {
unit_test: true,
@@ -83,25 +75,12 @@
}
rust_test {
- name: "matches_device_test_tests_macro_use_one",
- defaults: ["matches_test_defaults_matches"],
+ name: "matches_test_tests_use_star",
+ defaults: ["matches_test_defaults"],
// has rustc warnings
- srcs: ["tests/macro_use_one.rs"],
-}
-
-rust_test_host {
- name: "matches_host_test_tests_use_star",
- defaults: ["matches_test_defaults_matches"],
- // has rustc warnings
+ host_supported: true,
srcs: ["tests/use_star.rs"],
test_options: {
unit_test: true,
},
}
-
-rust_test {
- name: "matches_device_test_tests_use_star",
- defaults: ["matches_test_defaults_matches"],
- // has rustc warnings
- srcs: ["tests/use_star.rs"],
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 798b57b..577d626 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,29 +1,39 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/quiche"
+ },
+ {
+ "path": "external/rust/crates/url"
+ }
+ ],
"presubmit": [
{
"name": "doh_unit_test"
},
{
- "name": "matches_device_test_lib"
+ "name": "matches_test_lib"
},
{
- "name": "matches_device_test_tests_macro_use_one"
+ "name": "matches_test_tests_macro_use_one"
},
{
- "name": "quiche_device_test_src_lib"
+ "name": "matches_test_tests_use_star"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "doh_unit_test"
},
{
- "name": "unicode-bidi_device_test_src_lib"
+ "name": "matches_test_lib"
},
{
- "name": "url_device_test_src_lib"
+ "name": "matches_test_tests_macro_use_one"
},
{
- "name": "url_device_test_tests_data"
- },
- {
- "name": "url_device_test_tests_unit"
+ "name": "matches_test_tests_use_star"
}
]
}
