Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."
diff --git a/Android.bp b/Android.bp
index 33db522..e6b1a2e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,6 +42,8 @@
name: "libregex_syntax",
host_supported: true,
crate_name: "regex_syntax",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.6.25",
srcs: ["src/lib.rs"],
edition: "2018",
features: [
@@ -61,12 +63,18 @@
],
}
-rust_defaults {
- name: "regex-syntax_defaults",
+rust_test {
+ name: "regex-syntax_test_src_lib",
+ host_supported: true,
crate_name: "regex_syntax",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.6.25",
srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2018",
features: [
"default",
@@ -80,16 +88,3 @@
"unicode-segment",
],
}
-
-rust_test_host {
- name: "regex-syntax_host_test_src_lib",
- defaults: ["regex-syntax_defaults"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "regex-syntax_device_test_src_lib",
- defaults: ["regex-syntax_defaults"],
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 33a6ca8..a91d799 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": "base64_device_test_tests_decode"
- },
- {
- "name": "base64_device_test_tests_encode"
- },
- {
- "name": "base64_device_test_tests_helpers"
- },
- {
"name": "keystore2_test"
},
{
"name": "legacykeystore_test"
},
{
- "name": "libsqlite3-sys_device_test_src_lib"
+ "name": "regex-syntax_test_src_lib"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "keystore2_test"
},
{
- "name": "libsqlite3_bindgen_test"
+ "name": "legacykeystore_test"
},
{
- "name": "regex-syntax_device_test_src_lib"
- },
- {
- "name": "unicode-xid_device_test_src_lib"
- },
- {
- "name": "unicode-xid_device_test_tests_exhaustive_tests"
+ "name": "regex-syntax_test_src_lib"
}
]
}
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
