Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 1c324e2879
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/aho-corasick/+/1912653
Change-Id: I726deca9f18292a5a1c203425ed3be0c67c05571
diff --git a/Android.bp b/Android.bp
index 3d05f85..f0d6691 100644
--- a/Android.bp
+++ b/Android.bp
@@ -38,14 +38,18 @@
],
}
-rust_defaults {
- name: "aho-corasick_test_defaults",
+rust_test {
+ name: "aho-corasick_test_src_lib",
+ host_supported: true,
crate_name: "aho_corasick",
- srcs: ["src/lib.rs"],
cargo_env_compat: true,
cargo_pkg_version: "0.7.18",
+ srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2018",
features: [
"default",
@@ -56,19 +60,6 @@
],
}
-rust_test_host {
- name: "aho-corasick_host_test_src_lib",
- defaults: ["aho-corasick_test_defaults"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "aho-corasick_device_test_src_lib",
- defaults: ["aho-corasick_test_defaults"],
-}
-
rust_library {
name: "libaho_corasick",
host_supported: true,
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 1740d3e..32ebcea 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/libsqlite3-sys"
+ },
+ {
+ "path": "external/rust/crates/once_cell"
+ },
+ {
+ "path": "external/rust/crates/regex"
+ },
+ {
+ "path": "external/rust/crates/tinytemplate"
+ },
+ {
+ "path": "external/rust/crates/tinyvec"
+ },
+ {
+ "path": "external/rust/crates/unicode-xid"
+ }
+ ],
"presubmit": [
{
- "name": "aho-corasick_device_test_src_lib"
- },
- {
- "name": "base64_device_test_tests_decode"
- },
- {
- "name": "base64_device_test_tests_encode"
- },
- {
- "name": "base64_device_test_tests_helpers"
+ "name": "aho-corasick_test_src_lib"
},
{
"name": "keystore2_test"
},
{
"name": "legacykeystore_test"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "aho-corasick_test_src_lib"
},
{
- "name": "libsqlite3-sys_device_test_src_lib"
+ "name": "keystore2_test"
},
{
- "name": "libsqlite3_bindgen_test"
- },
- {
- "name": "unicode-xid_device_test_src_lib"
- },
- {
- "name": "unicode-xid_device_test_tests_exhaustive_tests"
+ "name": "legacykeystore_test"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
index 72ca2d4..ac56e26 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -7,4 +7,4 @@
"device": true,
"run": true,
"tests": true
-}
+}
\ No newline at end of file