Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: c5221907e5 am: c331235859 am: 4c5d078b87 am: 3b9c69deef
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/regex/+/1912795
Change-Id: I70c3a7b429b51946c02a04320255f059580d1763
diff --git a/Android.bp b/Android.bp
index 60315d9..d9edbe2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -76,14 +76,18 @@
],
}
-rust_defaults {
- name: "regex_test_defaults",
+rust_test {
+ name: "regex_test_src_lib",
+ host_supported: true,
crate_name: "regex",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.5.4",
srcs: ["src/lib.rs"],
- cargo_env_compat: true,
- cargo_pkg_version: "1.5.4",
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2018",
features: [
"aho-corasick",
@@ -114,27 +118,18 @@
],
}
-rust_test_host {
- name: "regex_host_test_src_lib",
- defaults: ["regex_test_defaults"],
- test_options: {
- unit_test: true,
- },
-}
-
rust_test {
- name: "regex_device_test_src_lib",
- defaults: ["regex_test_defaults"],
-}
-
-rust_defaults {
- name: "regex_test_defaults_backtrack",
+ name: "regex_test_tests_test_backtrack",
+ host_supported: true,
crate_name: "backtrack",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.5.4",
srcs: ["tests/test_backtrack.rs"],
- cargo_env_compat: true,
- cargo_pkg_version: "1.5.4",
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2018",
features: [
"aho-corasick",
@@ -166,27 +161,18 @@
],
}
-rust_test_host {
- name: "regex_host_test_tests_test_backtrack",
- defaults: ["regex_test_defaults_backtrack"],
- test_options: {
- unit_test: true,
- },
-}
-
rust_test {
- name: "regex_device_test_tests_test_backtrack",
- defaults: ["regex_test_defaults_backtrack"],
-}
-
-rust_defaults {
- name: "regex_test_defaults_backtrack_bytes",
+ name: "regex_test_tests_test_backtrack_bytes",
+ host_supported: true,
crate_name: "backtrack_bytes",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.5.4",
srcs: ["tests/test_backtrack_bytes.rs"],
- cargo_env_compat: true,
- cargo_pkg_version: "1.5.4",
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2018",
features: [
"aho-corasick",
@@ -218,27 +204,18 @@
],
}
-rust_test_host {
- name: "regex_host_test_tests_test_backtrack_bytes",
- defaults: ["regex_test_defaults_backtrack_bytes"],
- test_options: {
- unit_test: true,
- },
-}
-
rust_test {
- name: "regex_device_test_tests_test_backtrack_bytes",
- defaults: ["regex_test_defaults_backtrack_bytes"],
-}
-
-rust_defaults {
- name: "regex_test_defaults_backtrack_utf8bytes",
+ name: "regex_test_tests_test_backtrack_utf8bytes",
+ host_supported: true,
crate_name: "backtrack_utf8bytes",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.5.4",
srcs: ["tests/test_backtrack_utf8bytes.rs"],
- cargo_env_compat: true,
- cargo_pkg_version: "1.5.4",
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2018",
features: [
"aho-corasick",
@@ -270,27 +247,18 @@
],
}
-rust_test_host {
- name: "regex_host_test_tests_test_backtrack_utf8bytes",
- defaults: ["regex_test_defaults_backtrack_utf8bytes"],
- test_options: {
- unit_test: true,
- },
-}
-
rust_test {
- name: "regex_device_test_tests_test_backtrack_utf8bytes",
- defaults: ["regex_test_defaults_backtrack_utf8bytes"],
-}
-
-rust_defaults {
- name: "regex_test_defaults_crates_regex",
+ name: "regex_test_tests_test_crates_regex",
+ host_supported: true,
crate_name: "crates_regex",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.5.4",
srcs: ["tests/test_crates_regex.rs"],
- cargo_env_compat: true,
- cargo_pkg_version: "1.5.4",
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2018",
features: [
"aho-corasick",
@@ -322,27 +290,18 @@
],
}
-rust_test_host {
- name: "regex_host_test_tests_test_crates_regex",
- defaults: ["regex_test_defaults_crates_regex"],
- test_options: {
- unit_test: true,
- },
-}
-
rust_test {
- name: "regex_device_test_tests_test_crates_regex",
- defaults: ["regex_test_defaults_crates_regex"],
-}
-
-rust_defaults {
- name: "regex_test_defaults_default",
+ name: "regex_test_tests_test_default",
+ host_supported: true,
crate_name: "default",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.5.4",
srcs: ["tests/test_default.rs"],
- cargo_env_compat: true,
- cargo_pkg_version: "1.5.4",
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2018",
features: [
"aho-corasick",
@@ -374,27 +333,18 @@
],
}
-rust_test_host {
- name: "regex_host_test_tests_test_default",
- defaults: ["regex_test_defaults_default"],
- test_options: {
- unit_test: true,
- },
-}
-
rust_test {
- name: "regex_device_test_tests_test_default",
- defaults: ["regex_test_defaults_default"],
-}
-
-rust_defaults {
- name: "regex_test_defaults_default_bytes",
+ name: "regex_test_tests_test_default_bytes",
+ host_supported: true,
crate_name: "default_bytes",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.5.4",
srcs: ["tests/test_default_bytes.rs"],
- cargo_env_compat: true,
- cargo_pkg_version: "1.5.4",
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2018",
features: [
"aho-corasick",
@@ -426,27 +376,18 @@
],
}
-rust_test_host {
- name: "regex_host_test_tests_test_default_bytes",
- defaults: ["regex_test_defaults_default_bytes"],
- test_options: {
- unit_test: true,
- },
-}
-
rust_test {
- name: "regex_device_test_tests_test_default_bytes",
- defaults: ["regex_test_defaults_default_bytes"],
-}
-
-rust_defaults {
- name: "regex_test_defaults_nfa",
+ name: "regex_test_tests_test_nfa",
+ host_supported: true,
crate_name: "nfa",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.5.4",
srcs: ["tests/test_nfa.rs"],
- cargo_env_compat: true,
- cargo_pkg_version: "1.5.4",
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2018",
features: [
"aho-corasick",
@@ -478,27 +419,18 @@
],
}
-rust_test_host {
- name: "regex_host_test_tests_test_nfa",
- defaults: ["regex_test_defaults_nfa"],
- test_options: {
- unit_test: true,
- },
-}
-
rust_test {
- name: "regex_device_test_tests_test_nfa",
- defaults: ["regex_test_defaults_nfa"],
-}
-
-rust_defaults {
- name: "regex_test_defaults_nfa_bytes",
+ name: "regex_test_tests_test_nfa_bytes",
+ host_supported: true,
crate_name: "nfa_bytes",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.5.4",
srcs: ["tests/test_nfa_bytes.rs"],
- cargo_env_compat: true,
- cargo_pkg_version: "1.5.4",
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2018",
features: [
"aho-corasick",
@@ -530,27 +462,18 @@
],
}
-rust_test_host {
- name: "regex_host_test_tests_test_nfa_bytes",
- defaults: ["regex_test_defaults_nfa_bytes"],
- test_options: {
- unit_test: true,
- },
-}
-
rust_test {
- name: "regex_device_test_tests_test_nfa_bytes",
- defaults: ["regex_test_defaults_nfa_bytes"],
-}
-
-rust_defaults {
- name: "regex_test_defaults_nfa_utf8bytes",
+ name: "regex_test_tests_test_nfa_utf8bytes",
+ host_supported: true,
crate_name: "nfa_utf8bytes",
- srcs: ["tests/test_nfa_utf8bytes.rs"],
cargo_env_compat: true,
cargo_pkg_version: "1.5.4",
+ srcs: ["tests/test_nfa_utf8bytes.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2018",
features: [
"aho-corasick",
@@ -581,16 +504,3 @@
"libregex_syntax",
],
}
-
-rust_test_host {
- name: "regex_host_test_tests_test_nfa_utf8bytes",
- defaults: ["regex_test_defaults_nfa_utf8bytes"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "regex_device_test_tests_test_nfa_utf8bytes",
- defaults: ["regex_test_defaults_nfa_utf8bytes"],
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index d3da861..ee82488 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,77 +1,99 @@
// 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/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_test_src_lib"
},
{
- "name": "libsqlite3_bindgen_test"
+ "name": "regex_test_tests_test_backtrack"
},
{
- "name": "once_cell_device_test_src_lib"
+ "name": "regex_test_tests_test_backtrack_bytes"
},
{
- "name": "once_cell_device_test_tests_it"
+ "name": "regex_test_tests_test_backtrack_utf8bytes"
},
{
- "name": "regex_device_test_src_lib"
+ "name": "regex_test_tests_test_crates_regex"
},
{
- "name": "regex_device_test_tests_test_backtrack"
+ "name": "regex_test_tests_test_default"
},
{
- "name": "regex_device_test_tests_test_backtrack_bytes"
+ "name": "regex_test_tests_test_default_bytes"
},
{
- "name": "regex_device_test_tests_test_backtrack_utf8bytes"
+ "name": "regex_test_tests_test_nfa"
},
{
- "name": "regex_device_test_tests_test_crates_regex"
+ "name": "regex_test_tests_test_nfa_bytes"
},
{
- "name": "regex_device_test_tests_test_default"
+ "name": "regex_test_tests_test_nfa_utf8bytes"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "keystore2_test"
},
{
- "name": "regex_device_test_tests_test_default_bytes"
+ "name": "legacykeystore_test"
},
{
- "name": "regex_device_test_tests_test_nfa"
+ "name": "regex_test_src_lib"
},
{
- "name": "regex_device_test_tests_test_nfa_bytes"
+ "name": "regex_test_tests_test_backtrack"
},
{
- "name": "regex_device_test_tests_test_nfa_utf8bytes"
+ "name": "regex_test_tests_test_backtrack_bytes"
},
{
- "name": "tinytemplate_device_test_src_lib"
+ "name": "regex_test_tests_test_backtrack_utf8bytes"
},
{
- "name": "tinyvec_device_test_tests_arrayvec"
+ "name": "regex_test_tests_test_crates_regex"
},
{
- "name": "tinyvec_device_test_tests_tinyvec"
+ "name": "regex_test_tests_test_default"
},
{
- "name": "unicode-xid_device_test_src_lib"
+ "name": "regex_test_tests_test_default_bytes"
},
{
- "name": "unicode-xid_device_test_tests_exhaustive_tests"
+ "name": "regex_test_tests_test_nfa"
+ },
+ {
+ "name": "regex_test_tests_test_nfa_bytes"
+ },
+ {
+ "name": "regex_test_tests_test_nfa_utf8bytes"
}
]
}
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