diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-12-15 18:06:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 18:06:58 +0000 |
| commit | 10010abe3933fe59003178dc39727b16571bfda9 (patch) | |
| tree | e3f869acbb865963ae723f0c01f6738e704354b3 | |
| parent | 848dc46ef17c1b2b7a34270372d852bba7a122a2 (diff) | |
| parent | 3d3bc4d87ae2aca1a6f6e3ad9e68f1140257038e (diff) | |
| download | arbitrary-10010abe3933fe59003178dc39727b16571bfda9.tar.gz | |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: c99b63aae0 am: 8265fe9a6e am: 5d4a0b03bd am: 3d3bc4d87a
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/arbitrary/+/1912597
Change-Id: Ic4752e2dbc7272b55c36f4561f3cb5668bd9d5dc
| -rw-r--r-- | Android.bp | 60 | ||||
| -rw-r--r-- | TEST_MAPPING | 11 | ||||
| -rw-r--r-- | cargo2android.json | 2 |
3 files changed, 22 insertions, 51 deletions
@@ -37,14 +37,18 @@ license { ], } -rust_defaults { - name: "arbitrary_test_defaults", +rust_test { + name: "arbitrary_test_src_lib", + host_supported: true, crate_name: "arbitrary", - srcs: ["src/lib.rs"], cargo_env_compat: true, cargo_pkg_version: "1.0.2", + srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", features: [ "derive", @@ -53,26 +57,18 @@ rust_defaults { proc_macros: ["libderive_arbitrary"], } -rust_test_host { - name: "arbitrary_host_test_src_lib", - defaults: ["arbitrary_test_defaults"], - test_options: { - unit_test: true, - }, -} - rust_test { - name: "arbitrary_device_test_src_lib", - defaults: ["arbitrary_test_defaults"], -} - -rust_defaults { - name: "arbitrary_test_defaults_arbitrary", + name: "arbitrary_test_tests_derive", + host_supported: true, crate_name: "arbitrary", cargo_env_compat: true, cargo_pkg_version: "1.0.2", + srcs: ["tests/derive.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", features: [ "derive", @@ -84,36 +80,6 @@ rust_defaults { proc_macros: ["libderive_arbitrary"], } -rust_test_host { - name: "arbitrary_host_test_tests_derive", - defaults: ["arbitrary_test_defaults_arbitrary"], - srcs: ["tests/derive.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "arbitrary_device_test_tests_derive", - defaults: ["arbitrary_test_defaults_arbitrary"], - srcs: ["tests/derive.rs"], -} - -rust_test_host { - name: "arbitrary_host_test_tests_path", - defaults: ["arbitrary_test_defaults_arbitrary"], - srcs: ["tests/path.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "arbitrary_device_test_tests_path", - defaults: ["arbitrary_test_defaults_arbitrary"], - srcs: ["tests/path.rs"], -} - rust_library_rlib { name: "libarbitrary", host_supported: true, diff --git a/TEST_MAPPING b/TEST_MAPPING index 75be883..707daa8 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -2,13 +2,18 @@ { "presubmit": [ { - "name": "arbitrary_device_test_src_lib" + "name": "arbitrary_test_src_lib" }, { - "name": "arbitrary_device_test_tests_derive" + "name": "arbitrary_test_tests_derive" + } + ], + "presubmit-rust": [ + { + "name": "arbitrary_test_src_lib" }, { - "name": "arbitrary_device_test_tests_path" + "name": "arbitrary_test_tests_derive" } ] } diff --git a/cargo2android.json b/cargo2android.json index c586b5e..8c95f8e 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -5,4 +5,4 @@ "force-rlib": true, "run": true, "tests": true -} +}
\ No newline at end of file |