Enable regex-syntax on the device.
This is required by criterion library.
Bug: 155309706
Change-Id: I3c586d4277f711b27c775b5a9d3cf988f1bae105
diff --git a/Android.bp b/Android.bp
index 39051a6..05f641b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,44 +1,9 @@
-// This file is generated by cargo2android.py --run --dependencies --tests.
+// This file is generated by cargo2android.py --run --device --dependencies --tests.
+// Do not modify this file as changes will be overridden on upgrade.
-package {
- default_applicable_licenses: ["external_rust_crates_regex-syntax_license"],
-}
-
-// Added automatically by a large-scale-change that took the approach of
-// 'apply every license found to every target'. While this makes sure we respect
-// every license restriction, it may not be entirely correct.
-//
-// e.g. GPL in an MIT project might only apply to the contrib/ directory.
-//
-// Please consider splitting the single license below into multiple licenses,
-// taking care not to lose any license_kind information, and overriding the
-// default license using the 'licenses: [...]' property on targets as needed.
-//
-// For unused files, consider creating a 'filegroup' with "//visibility:private"
-// to attach the license to, and including a comment whether the files may be
-// used in the current project.
-//
-// large-scale-change included anything that looked like it might be a license
-// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc.
-//
-// Please consider removing redundant or irrelevant files from 'license_text:'.
-// http://go/android-license-faq
-license {
- name: "external_rust_crates_regex-syntax_license",
- visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-MIT",
- "SPDX-license-identifier-Unicode-DFS",
- ],
- license_text: [
- "LICENSE-APACHE",
- "LICENSE-MIT",
- ],
-}
-
-rust_library_host {
+rust_library {
name: "libregex_syntax",
+ host_supported: true,
crate_name: "regex_syntax",
srcs: ["src/lib.rs"],
edition: "2015",
@@ -55,25 +20,35 @@
],
}
+rust_defaults {
+ name: "regex-syntax_defaults",
+ crate_name: "regex_syntax",
+ srcs: ["src/lib.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
+ edition: "2015",
+ features: [
+ "default",
+ "unicode",
+ "unicode-age",
+ "unicode-bool",
+ "unicode-case",
+ "unicode-gencat",
+ "unicode-perl",
+ "unicode-script",
+ "unicode-segment",
+ ],
+}
+
rust_test_host {
name: "regex-syntax_host_test_src_lib",
- crate_name: "regex_syntax",
- srcs: ["src/lib.rs"],
- test_suites: ["general-tests"],
- auto_gen_config: true,
+ defaults: ["regex-syntax_defaults"],
test_options: {
unit_test: true,
},
- edition: "2015",
- features: [
- "default",
- "unicode",
- "unicode-age",
- "unicode-bool",
- "unicode-case",
- "unicode-gencat",
- "unicode-perl",
- "unicode-script",
- "unicode-segment",
- ],
+}
+
+rust_test {
+ name: "regex-syntax_device_test_src_lib",
+ defaults: ["regex-syntax_defaults"],
}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 03d7e78..28d44c6 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,11 +1,17 @@
-// Generated by cargo2android.py for tests that depend on this crate.
+// Generated by update_crate_tests.py for tests that depend on this crate.
{
"presubmit": [
{
- "name": "libsqlite3-sys_device_test_src_lib"
+ "name": "keystore2_test"
},
{
- "name": "keystore2_test"
+ "name": "regex-syntax_device_test_src_lib"
+ },
+ {
+ "name": "vpnprofilestore_test"
+ },
+ {
+ "name": "libsqlite3-sys_device_test_src_lib"
}
]
}
