Refresh Android.bp, cargo2android.json, TEST_MAPPING.
Test: None
Change-Id: Iad9ca8a999632eb46fe630a003cfc4fc1d9f657f
diff --git a/Android.bp b/Android.bp
index cdef21d..bd2fd22 100644
--- a/Android.bp
+++ b/Android.bp
@@ -57,14 +57,18 @@
min_sdk_version: "29",
}
-rust_defaults {
- name: "unicode-bidi_test_defaults",
+rust_test {
+ name: "unicode-bidi_test_src_lib",
+ host_supported: true,
crate_name: "unicode_bidi",
- srcs: ["src/lib.rs"],
cargo_env_compat: true,
cargo_pkg_version: "0.3.6",
+ srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2018",
features: [
"default",
@@ -74,16 +78,3 @@
"libserde_test",
],
}
-
-rust_test_host {
- name: "unicode-bidi_host_test_src_lib",
- defaults: ["unicode-bidi_test_defaults"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "unicode-bidi_device_test_src_lib",
- defaults: ["unicode-bidi_test_defaults"],
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 4fe6b66..2f8032a 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,23 +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/url"
+ }
+ ],
"presubmit": [
{
"name": "doh_unit_test"
},
{
- "name": "quiche_device_test_src_lib"
+ "name": "unicode-bidi_test_src_lib"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "doh_unit_test"
},
{
- "name": "unicode-bidi_device_test_src_lib"
- },
- {
- "name": "url_device_test_src_lib"
- },
- {
- "name": "url_device_test_tests_data"
- },
- {
- "name": "url_device_test_tests_unit"
+ "name": "unicode-bidi_test_src_lib"
}
]
}
