diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-12-15 17:27:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 17:27:10 +0000 |
| commit | 11efe7b8cf6159860eeeb2d2658f14aac0387e33 (patch) | |
| tree | 368bee7eed00fbf77494eb6723fc9c6d14419f6a | |
| parent | d9eaf27041e00b5b50f79dd7ea36abc40998db31 (diff) | |
| parent | b091ab35e503b0765f739a29c446d7298fee4e95 (diff) | |
| download | quickcheck-11efe7b8cf6159860eeeb2d2658f14aac0387e33.tar.gz | |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 6531c8d3ca am: ad04c6abfe am: b091ab35e5
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quickcheck/+/1912794
Change-Id: Ic1223718b47f4dc311876397473f08be88b42a07
| -rw-r--r-- | Android.bp | 27 | ||||
| -rw-r--r-- | TEST_MAPPING | 18 | ||||
| -rw-r--r-- | cargo2android.json | 2 |
3 files changed, 26 insertions, 21 deletions
@@ -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_library { ], } -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 @@ rust_defaults { "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 |