Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 6531c8d3ca am: ad04c6abfe am: b091ab35e5 am: 11efe7b8cf
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quickcheck/+/1912794
Change-Id: I81dd66eed32fe708a3bcbe0e0f68d16fc27a02f1
diff --git a/Android.bp b/Android.bp
index a2de071..649bbd9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
-
-
package {
default_applicable_licenses: ["external_rust_crates_quickcheck_license"],
}
@@ -63,15 +61,19 @@
],
}
-rust_defaults {
- name: "quickcheck_test_defaults",
- crate_name: "quickcheck",
+rust_test {
+ name: "quickcheck_test_src_lib",
// has rustc warnings
- srcs: ["src/lib.rs"],
+ host_supported: true,
+ crate_name: "quickcheck",
cargo_env_compat: true,
cargo_pkg_version: "1.0.3",
+ srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2018",
features: [
"default",
@@ -86,16 +88,3 @@
"librand",
],
}
-
-rust_test_host {
- name: "quickcheck_host_test_src_lib",
- defaults: ["quickcheck_test_defaults"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "quickcheck_device_test_src_lib",
- defaults: ["quickcheck_test_defaults"],
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index ddd590f..470b30a 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,8 +1,24 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/cast"
+ },
+ {
+ "path": "external/rust/crates/crc32fast"
+ },
+ {
+ "path": "external/rust/crates/regex"
+ }
+ ],
"presubmit": [
{
- "name": "quickcheck_device_test_src_lib"
+ "name": "quickcheck_test_src_lib"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "quickcheck_test_src_lib"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
index 3ebdf72..cf6ca9c 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -3,4 +3,4 @@
"device": true,
"run": true,
"tests": true
-}
+}
\ No newline at end of file