diff options
author | Andrew Walbran <qwandor@google.com> | 2023-11-14 16:35:31 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-14 16:35:31 +0000 |
commit | 062cfe4087d7d5a89fb8713fd80651031706b06e (patch) | |
tree | 8a763a1c5550d7d09e4a8f40721ff3f388c15895 | |
parent | b9baed00b83eca0b5fc83a69b729f87b028e012d (diff) | |
parent | cf908a4d4456a116cc7a6a810daca2a656f1f9cc (diff) | |
download | crossbeam-queue-062cfe4087d7d5a89fb8713fd80651031706b06e.tar.gz |
Migrate to cargo_embargo. am: cf908a4d44
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/crossbeam-queue/+/2828059
Change-Id: I1e332a38ce031deed3d226214c3fe3f82e47e2cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 41 | ||||
-rw-r--r-- | cargo_embargo.json (renamed from cargo2android.json) | 6 |
2 files changed, 28 insertions, 19 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --config cargo2android.json. +// This file is generated by cargo_embargo. // Do not modify this file as changes will be overridden on upgrade. package { @@ -39,13 +39,18 @@ license { ], } -rust_defaults { - name: "crossbeam-queue_test_defaults", - crate_name: "crossbeam_queue", +rust_test { + name: "crossbeam-queue_test_tests_array_queue", + host_supported: true, + crate_name: "array_queue", cargo_env_compat: true, cargo_pkg_version: "0.3.8", + srcs: ["tests/array_queue.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", features: [ "alloc", @@ -61,23 +66,29 @@ rust_defaults { } rust_test { - name: "crossbeam-queue_test_tests_array_queue", - defaults: ["crossbeam-queue_test_defaults"], - host_supported: true, - srcs: ["tests/array_queue.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { name: "crossbeam-queue_test_tests_seg_queue", - defaults: ["crossbeam-queue_test_defaults"], host_supported: true, + crate_name: "seg_queue", + cargo_env_compat: true, + cargo_pkg_version: "0.3.8", srcs: ["tests/seg_queue.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2018", + features: [ + "alloc", + "default", + "std", + ], + rustlibs: [ + "libcfg_if", + "libcrossbeam_queue", + "libcrossbeam_utils", + "librand", + ], } rust_library { diff --git a/cargo2android.json b/cargo_embargo.json index 6e516e0..7f14879 100644 --- a/cargo2android.json +++ b/cargo_embargo.json @@ -1,9 +1,7 @@ { - "apex-available": [ + "apex_available": [ "//apex_available:platform", "com.android.virt" ], - "device": true, - "run": true, "tests": true -}
\ No newline at end of file +} |