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
diff --git a/Android.bp b/Android.bp
index 3a11a22..19545ce 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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 @@
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 @@
"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
