diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:02:31 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:02:31 +0000 |
commit | 6d683916f1caa6f6c1e1111d6766e44fea016d67 (patch) | |
tree | 04746dbf501ec3ecc5e9a87964764df52e5fe7e3 | |
parent | 50eddb9d32e2b7ddec72a426f6b947da353b0c1c (diff) | |
parent | bfa294896cf988aff434f1c546e32c3cf917b94b (diff) | |
download | regex-automata-6d683916f1caa6f6c1e1111d6766e44fea016d67.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: bfa294896c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/regex-automata/+/1912439
Change-Id: I71d1e612796009e20e8213baedf1628d33e71b26
-rw-r--r-- | Android.bp | 7 | ||||
-rw-r--r-- | TEST_MAPPING | 13 | ||||
-rw-r--r-- | cargo2android.json | 4 |
3 files changed, 12 insertions, 12 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --dependencies. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -44,6 +44,8 @@ rust_library { name: "libregex_automata", host_supported: true, crate_name: "regex_automata", + cargo_env_compat: true, + cargo_pkg_version: "0.1.10", srcs: ["src/lib.rs"], edition: "2015", features: [ @@ -59,6 +61,3 @@ rust_library { "libregex_syntax", ], } - -// dependent_library ["feature_list"] -// regex-syntax-0.6.25 "default,unicode,unicode-age,unicode-bool,unicode-case,unicode-gencat,unicode-perl,unicode-script,unicode-segment" diff --git a/TEST_MAPPING b/TEST_MAPPING index 05c6d70..3cbd48d 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,20 +1,17 @@ // 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/tinytemplate" }, { - "name": "base64_device_test_tests_helpers" + "path": "external/rust/crates/tinyvec" }, { - "name": "unicode-xid_device_test_src_lib" - }, - { - "name": "unicode-xid_device_test_tests_exhaustive_tests" + "path": "external/rust/crates/unicode-xid" } ] } diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..bf78496 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,4 @@ +{ + "device": true, + "run": true +}
\ No newline at end of file |