diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 15:28:00 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-12-15 15:28:00 +0000 |
commit | b6cdb00b1ff876d3d54932ba22417a710eade4e1 (patch) | |
tree | 7aade84519300d0c3b97ce490f9b4bd576b4666b | |
parent | 340d6076659224880e27da663ea9a156690adc44 (diff) | |
parent | c627c13df06edcdb073898a9512467bc51ce69bd (diff) | |
download | regex-syntax-b6cdb00b1ff876d3d54932ba22417a710eade4e1.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."
-rw-r--r-- | Android.bp | 25 | ||||
-rw-r--r-- | TEST_MAPPING | 35 | ||||
-rw-r--r-- | cargo2android.json | 2 |
3 files changed, 35 insertions, 27 deletions
@@ -42,6 +42,8 @@ rust_library { 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_library { ], } -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 @@ rust_defaults { "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. { - "presubmit": [ + "imports": [ { - "name": "base64_device_test_tests_decode" + "path": "external/rust/crates/base64" }, { - "name": "base64_device_test_tests_encode" + "path": "external/rust/crates/libsqlite3-sys" }, { - "name": "base64_device_test_tests_helpers" + "path": "external/rust/crates/once_cell" }, { - "name": "keystore2_test" + "path": "external/rust/crates/regex" }, { - "name": "legacykeystore_test" + "path": "external/rust/crates/tinytemplate" }, { - "name": "libsqlite3-sys_device_test_src_lib" + "path": "external/rust/crates/tinyvec" + }, + { + "path": "external/rust/crates/unicode-xid" + } + ], + "presubmit": [ + { + "name": "keystore2_test" }, { - "name": "libsqlite3_bindgen_test" + "name": "legacykeystore_test" }, { - "name": "regex-syntax_device_test_src_lib" + "name": "regex-syntax_test_src_lib" + } + ], + "presubmit-rust": [ + { + "name": "keystore2_test" }, { - "name": "unicode-xid_device_test_src_lib" + "name": "legacykeystore_test" }, { - "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 |