diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 18:06:56 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 18:06:56 +0000 |
commit | edba90dd56275483c20d42441fdfec692fe9861c (patch) | |
tree | 4a0571f5c6324de5d373707f7335b029a8ee1395 | |
parent | a8942aeaca6822523695817643d1b3563236bf2e (diff) | |
parent | 0bad2cfdc50b55b3143512e85d73250b3638e8e3 (diff) | |
download | aho-corasick-edba90dd56275483c20d42441fdfec692fe9861c.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 1c324e2879 am: 56956cc330 am: 5e335bbac9 am: 0bad2cfdc5
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/aho-corasick/+/1912653
Change-Id: Iccdc86d05143f3f8c544d413addb5f6e0096510d
-rw-r--r-- | Android.bp | 23 | ||||
-rw-r--r-- | TEST_MAPPING | 35 | ||||
-rw-r--r-- | cargo2android.json | 2 |
3 files changed, 32 insertions, 28 deletions
@@ -38,14 +38,18 @@ license { ], } -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_defaults { ], } -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. { - "presubmit": [ + "imports": [ { - "name": "aho-corasick_device_test_src_lib" + "path": "external/rust/crates/base64" }, { - "name": "base64_device_test_tests_decode" + "path": "external/rust/crates/libsqlite3-sys" }, { - "name": "base64_device_test_tests_encode" + "path": "external/rust/crates/once_cell" }, { - "name": "base64_device_test_tests_helpers" + "path": "external/rust/crates/regex" }, { - "name": "keystore2_test" + "path": "external/rust/crates/tinytemplate" }, { - "name": "legacykeystore_test" + "path": "external/rust/crates/tinyvec" + }, + { + "path": "external/rust/crates/unicode-xid" + } + ], + "presubmit": [ + { + "name": "aho-corasick_test_src_lib" }, { - "name": "libsqlite3-sys_device_test_src_lib" + "name": "keystore2_test" }, { - "name": "libsqlite3_bindgen_test" + "name": "legacykeystore_test" + } + ], + "presubmit-rust": [ + { + "name": "aho-corasick_test_src_lib" }, { - "name": "unicode-xid_device_test_src_lib" + "name": "keystore2_test" }, { - "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 |