Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 279c65492a am: 2a0aa2e14d
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/crossbeam-queue/+/1912188
Change-Id: I8bcf707476dd3f346652d063f7395a3b6dc0c255
diff --git a/Android.bp b/Android.bp
index 8589c95..64887a8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,40 +42,6 @@
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"],
- auto_gen_config: true,
- edition: "2018",
- features: [
- "alloc",
- "default",
- "std",
- ],
- rustlibs: [
- "libcfg_if",
- "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",
- 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"],
@@ -94,9 +60,10 @@
],
}
-rust_test_host {
- name: "crossbeam-queue_host_test_tests_array_queue",
- defaults: ["crossbeam-queue_test_defaults_crossbeam_queue"],
+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,
@@ -104,26 +71,15 @@
}
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_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"
- //}
+ ],
+ "presubmit-rust": [
+ {
+ "name": "crossbeam-queue_test_tests_array_queue"
+ },
+ {
+ "name": "crossbeam-queue_test_tests_seg_queue"
+ }
]
}