diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 18:07:17 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 18:07:17 +0000 |
commit | 7c4507784401190d995b17655d5fe0ee81de9ea2 (patch) | |
tree | 60f1b582b960b9d6f32bf9df88e2ea5a193fd09a | |
parent | 36b36e2055cecc2598584bd99c821feacb4189f7 (diff) | |
parent | 872d1dea5cc2e18adff8311781a892a3a15ed37f (diff) | |
download | crossbeam-queue-7c4507784401190d995b17655d5fe0ee81de9ea2.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 279c65492a am: 2a0aa2e14d am: 9dc5524cc5 am: 872d1dea5c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/crossbeam-queue/+/1912188
Change-Id: I8b8b13343bc8c06aa6b7b53f7d1e28cedf45ef18
-rw-r--r-- | Android.bp | 56 | ||||
-rw-r--r-- | TEST_MAPPING | 21 |
2 files changed, 19 insertions, 58 deletions
@@ -42,7 +42,6 @@ license { rust_defaults { name: "crossbeam-queue_test_defaults", crate_name: "crossbeam_queue", - srcs: ["src/lib.rs"], cargo_env_compat: true, cargo_pkg_version: "0.3.2", test_suites: ["general-tests"], @@ -55,48 +54,16 @@ rust_defaults { ], rustlibs: [ "libcfg_if", + "libcrossbeam_queue", "libcrossbeam_utils", "librand", ], } -rust_test_host { - name: "crossbeam-queue_host_test_src_lib", - defaults: ["crossbeam-queue_test_defaults"], - test_options: { - unit_test: true, - }, -} - rust_test { - name: "crossbeam-queue_device_test_src_lib", + name: "crossbeam-queue_test_tests_array_queue", defaults: ["crossbeam-queue_test_defaults"], -} - -rust_defaults { - name: "crossbeam-queue_test_defaults_crossbeam_queue", - crate_name: "crossbeam_queue", - cargo_env_compat: true, - cargo_pkg_version: "0.3.2", - test_suites: ["general-tests"], - auto_gen_config: true, - edition: "2018", - features: [ - "alloc", - "default", - "std", - ], - rustlibs: [ - "libcfg_if", - "libcrossbeam_queue", - "libcrossbeam_utils", - "librand", - ], -} - -rust_test_host { - name: "crossbeam-queue_host_test_tests_array_queue", - defaults: ["crossbeam-queue_test_defaults_crossbeam_queue"], + host_supported: true, srcs: ["tests/array_queue.rs"], test_options: { unit_test: true, @@ -104,26 +71,15 @@ rust_test_host { } rust_test { - name: "crossbeam-queue_device_test_tests_array_queue", - defaults: ["crossbeam-queue_test_defaults_crossbeam_queue"], - srcs: ["tests/array_queue.rs"], -} - -rust_test_host { - name: "crossbeam-queue_host_test_tests_seg_queue", - defaults: ["crossbeam-queue_test_defaults_crossbeam_queue"], + name: "crossbeam-queue_test_tests_seg_queue", + defaults: ["crossbeam-queue_test_defaults"], + host_supported: true, srcs: ["tests/seg_queue.rs"], test_options: { unit_test: true, }, } -rust_test { - name: "crossbeam-queue_device_test_tests_seg_queue", - defaults: ["crossbeam-queue_test_defaults_crossbeam_queue"], - srcs: ["tests/seg_queue.rs"], -} - rust_library { name: "libcrossbeam_queue", host_supported: true, diff --git a/TEST_MAPPING b/TEST_MAPPING index 53eefac..ffd0851 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,19 +1,24 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { + "imports": [ + { + "path": "external/rust/crates/vulkano" + } + ], "presubmit": [ { - "name": "crossbeam-queue_device_test_src_lib" + "name": "crossbeam-queue_test_tests_array_queue" }, { - "name": "crossbeam-queue_device_test_tests_array_queue" + "name": "crossbeam-queue_test_tests_seg_queue" + } + ], + "presubmit-rust": [ + { + "name": "crossbeam-queue_test_tests_array_queue" }, { - "name": "crossbeam-queue_device_test_tests_seg_queue" + "name": "crossbeam-queue_test_tests_seg_queue" } - // Manually disabled as these tests depend on specific graphics libraries - // being available on the machine running the tests. - //{ - // "name": "vulkano_device_test_src_lib" - //} ] } |