Enable tests in Android CI am: b783e64cdf am: 01a5f65667
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/aho-corasick/+/1859114
Change-Id: I0e28046eb8e668257af3141d3f3d06e8505057d6
diff --git a/Android.bp b/Android.bp
index c810b87..3d05f85 100644
--- a/Android.bp
+++ b/Android.bp
@@ -38,10 +38,43 @@
],
}
+rust_defaults {
+ name: "aho-corasick_test_defaults",
+ crate_name: "aho_corasick",
+ srcs: ["src/lib.rs"],
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.7.18",
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
+ edition: "2018",
+ features: [
+ "default",
+ "std",
+ ],
+ rustlibs: [
+ "libmemchr",
+ ],
+}
+
+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,
crate_name: "aho_corasick",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.7.18",
srcs: ["src/lib.rs"],
edition: "2018",
features: [
@@ -56,6 +89,3 @@
"com.android.virt",
],
}
-
-// dependent_library ["feature_list"]
-// memchr-2.4.0 "std"
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 9e661de..1740d3e 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,6 +2,9 @@
{
"presubmit": [
{
+ "name": "aho-corasick_device_test_src_lib"
+ },
+ {
"name": "base64_device_test_tests_decode"
},
{
diff --git a/cargo2android.json b/cargo2android.json
index 5c18d15..72ca2d4 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -5,5 +5,6 @@
],
"dependencies": true,
"device": true,
- "run": true
+ "run": true,
+ "tests": true
}