Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 61aa5cee2d am: b5cbbc450d am: 401defcc25 am: 4d6316d9bb
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/crossbeam-utils/+/1912004
Change-Id: Ic478052461c46e6558e1439c5df5e948edca0392
diff --git a/Android.bp b/Android.bp
index 44c8fe4..60ccb4e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -39,14 +39,18 @@
],
}
-rust_defaults {
- name: "crossbeam-utils_test_defaults",
+rust_test {
+ name: "crossbeam-utils_test_src_lib",
+ host_supported: true,
crate_name: "crossbeam_utils",
- srcs: ["src/lib.rs"],
cargo_env_compat: true,
cargo_pkg_version: "0.8.5",
+ srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2018",
features: [
"default",
@@ -60,21 +64,8 @@
],
}
-rust_test_host {
- name: "crossbeam-utils_host_test_src_lib",
- defaults: ["crossbeam-utils_test_defaults"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "crossbeam-utils_device_test_src_lib",
- defaults: ["crossbeam-utils_test_defaults"],
-}
-
rust_defaults {
- name: "crossbeam-utils_test_defaults_crossbeam_utils",
+ name: "crossbeam-utils_test_defaults",
crate_name: "crossbeam_utils",
cargo_env_compat: true,
cargo_pkg_version: "0.8.5",
@@ -94,9 +85,10 @@
],
}
-rust_test_host {
- name: "crossbeam-utils_host_test_tests_atomic_cell",
- defaults: ["crossbeam-utils_test_defaults_crossbeam_utils"],
+rust_test {
+ name: "crossbeam-utils_test_tests_atomic_cell",
+ defaults: ["crossbeam-utils_test_defaults"],
+ host_supported: true,
srcs: ["tests/atomic_cell.rs"],
test_options: {
unit_test: true,
@@ -104,14 +96,9 @@
}
rust_test {
- name: "crossbeam-utils_device_test_tests_atomic_cell",
- defaults: ["crossbeam-utils_test_defaults_crossbeam_utils"],
- srcs: ["tests/atomic_cell.rs"],
-}
-
-rust_test_host {
- name: "crossbeam-utils_host_test_tests_cache_padded",
- defaults: ["crossbeam-utils_test_defaults_crossbeam_utils"],
+ name: "crossbeam-utils_test_tests_cache_padded",
+ defaults: ["crossbeam-utils_test_defaults"],
+ host_supported: true,
srcs: ["tests/cache_padded.rs"],
test_options: {
unit_test: true,
@@ -119,14 +106,9 @@
}
rust_test {
- name: "crossbeam-utils_device_test_tests_cache_padded",
- defaults: ["crossbeam-utils_test_defaults_crossbeam_utils"],
- srcs: ["tests/cache_padded.rs"],
-}
-
-rust_test_host {
- name: "crossbeam-utils_host_test_tests_parker",
- defaults: ["crossbeam-utils_test_defaults_crossbeam_utils"],
+ name: "crossbeam-utils_test_tests_parker",
+ defaults: ["crossbeam-utils_test_defaults"],
+ host_supported: true,
srcs: ["tests/parker.rs"],
test_options: {
unit_test: true,
@@ -134,14 +116,9 @@
}
rust_test {
- name: "crossbeam-utils_device_test_tests_parker",
- defaults: ["crossbeam-utils_test_defaults_crossbeam_utils"],
- srcs: ["tests/parker.rs"],
-}
-
-rust_test_host {
- name: "crossbeam-utils_host_test_tests_sharded_lock",
- defaults: ["crossbeam-utils_test_defaults_crossbeam_utils"],
+ name: "crossbeam-utils_test_tests_sharded_lock",
+ defaults: ["crossbeam-utils_test_defaults"],
+ host_supported: true,
srcs: ["tests/sharded_lock.rs"],
test_options: {
unit_test: true,
@@ -149,14 +126,9 @@
}
rust_test {
- name: "crossbeam-utils_device_test_tests_sharded_lock",
- defaults: ["crossbeam-utils_test_defaults_crossbeam_utils"],
- srcs: ["tests/sharded_lock.rs"],
-}
-
-rust_test_host {
- name: "crossbeam-utils_host_test_tests_thread",
- defaults: ["crossbeam-utils_test_defaults_crossbeam_utils"],
+ name: "crossbeam-utils_test_tests_thread",
+ defaults: ["crossbeam-utils_test_defaults"],
+ host_supported: true,
srcs: ["tests/thread.rs"],
test_options: {
unit_test: true,
@@ -164,26 +136,15 @@
}
rust_test {
- name: "crossbeam-utils_device_test_tests_thread",
- defaults: ["crossbeam-utils_test_defaults_crossbeam_utils"],
- srcs: ["tests/thread.rs"],
-}
-
-rust_test_host {
- name: "crossbeam-utils_host_test_tests_wait_group",
- defaults: ["crossbeam-utils_test_defaults_crossbeam_utils"],
+ name: "crossbeam-utils_test_tests_wait_group",
+ defaults: ["crossbeam-utils_test_defaults"],
+ host_supported: true,
srcs: ["tests/wait_group.rs"],
test_options: {
unit_test: true,
},
}
-rust_test {
- name: "crossbeam-utils_device_test_tests_wait_group",
- defaults: ["crossbeam-utils_test_defaults_crossbeam_utils"],
- srcs: ["tests/wait_group.rs"],
-}
-
rust_library {
name: "libcrossbeam_utils",
host_supported: true,
diff --git a/TEST_MAPPING b/TEST_MAPPING
index c8e0e13..eb8da39 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,47 +1,78 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/base64"
+ },
+ {
+ "path": "external/rust/crates/crossbeam-deque"
+ },
+ {
+ "path": "external/rust/crates/crossbeam-epoch"
+ },
+ {
+ "path": "external/rust/crates/crossbeam-queue"
+ },
+ {
+ "path": "external/rust/crates/once_cell"
+ },
+ {
+ "path": "external/rust/crates/tinytemplate"
+ },
+ {
+ "path": "external/rust/crates/tinyvec"
+ },
+ {
+ "path": "external/rust/crates/unicode-xid"
+ },
+ {
+ "path": "external/rust/crates/vulkano"
+ }
+ ],
"presubmit": [
{
- "name": "base64_device_test_tests_decode"
+ "name": "crossbeam-utils_test_src_lib"
},
{
- "name": "base64_device_test_tests_encode"
+ "name": "crossbeam-utils_test_tests_atomic_cell"
},
{
- "name": "base64_device_test_tests_helpers"
+ "name": "crossbeam-utils_test_tests_cache_padded"
},
{
- "name": "crossbeam-epoch_device_test_src_lib"
+ "name": "crossbeam-utils_test_tests_parker"
},
{
- "name": "crossbeam-epoch_device_test_tests_loom"
+ "name": "crossbeam-utils_test_tests_sharded_lock"
},
{
- "name": "crossbeam-utils_device_test_src_lib"
+ "name": "crossbeam-utils_test_tests_thread"
},
{
- "name": "crossbeam-utils_device_test_tests_atomic_cell"
+ "name": "crossbeam-utils_test_tests_wait_group"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "crossbeam-utils_test_src_lib"
},
{
- "name": "crossbeam-utils_device_test_tests_cache_padded"
+ "name": "crossbeam-utils_test_tests_atomic_cell"
},
{
- "name": "crossbeam-utils_device_test_tests_parker"
+ "name": "crossbeam-utils_test_tests_cache_padded"
},
{
- "name": "crossbeam-utils_device_test_tests_sharded_lock"
+ "name": "crossbeam-utils_test_tests_parker"
},
{
- "name": "crossbeam-utils_device_test_tests_thread"
+ "name": "crossbeam-utils_test_tests_sharded_lock"
},
{
- "name": "crossbeam-utils_device_test_tests_wait_group"
+ "name": "crossbeam-utils_test_tests_thread"
},
{
- "name": "unicode-xid_device_test_src_lib"
- },
- {
- "name": "unicode-xid_device_test_tests_exhaustive_tests"
+ "name": "crossbeam-utils_test_tests_wait_group"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
index 86c645c..6e516e0 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,9 +1,9 @@
{
- "apex-available": [
- "//apex_available:platform",
- "com.android.virt"
- ],
- "device": true,
- "run": true,
- "tests": true
- }
\ No newline at end of file
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "device": true,
+ "run": true,
+ "tests": true
+}
\ No newline at end of file
