diff options
author | Joel Galenson <jgalenson@google.com> | 2021-11-29 14:03:28 -0800 |
---|---|---|
committer | Joel Galenson <jgalenson@google.com> | 2021-12-10 15:32:36 -0800 |
commit | fa8002d8d13944bbdb8cb9fb865d3b21b46750d4 (patch) | |
tree | e8d80e8e7b3d7d895244f528cc6e307d1a700729 | |
parent | b4be1265dde25f553f12ef46dcbf7263f9ccf739 (diff) | |
download | crossbeam-utils-fa8002d8d13944bbdb8cb9fb865d3b21b46750d4.tar.gz |
Refresh Android.bp, cargo2android.json, TEST_MAPPING.
Test: None
Change-Id: I558b55b8b79b69598fb4f3938740681f723b5ddd
-rw-r--r-- | Android.bp | 93 | ||||
-rw-r--r-- | TEST_MAPPING | 61 | ||||
-rw-r--r-- | cargo2android.json | 16 |
3 files changed, 81 insertions, 89 deletions
@@ -39,14 +39,18 @@ license { ], } -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_defaults { ], } -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_defaults { ], } -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_host { } 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_host { } 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_host { } 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_host { } 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_host { } 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. { - "presubmit": [ + "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" + }, { - "name": "base64_device_test_tests_decode" + "path": "external/rust/crates/unicode-xid" }, { - "name": "base64_device_test_tests_encode" + "path": "external/rust/crates/vulkano" + } + ], + "presubmit": [ + { + "name": "crossbeam-utils_test_src_lib" }, { - "name": "base64_device_test_tests_helpers" + "name": "crossbeam-utils_test_tests_atomic_cell" }, { - "name": "crossbeam-epoch_device_test_src_lib" + "name": "crossbeam-utils_test_tests_cache_padded" }, { - "name": "crossbeam-epoch_device_test_tests_loom" + "name": "crossbeam-utils_test_tests_parker" }, { - "name": "crossbeam-utils_device_test_src_lib" + "name": "crossbeam-utils_test_tests_sharded_lock" }, { - "name": "crossbeam-utils_device_test_tests_atomic_cell" + "name": "crossbeam-utils_test_tests_thread" }, { - "name": "crossbeam-utils_device_test_tests_cache_padded" + "name": "crossbeam-utils_test_tests_wait_group" + } + ], + "presubmit-rust": [ + { + "name": "crossbeam-utils_test_src_lib" }, { - "name": "crossbeam-utils_device_test_tests_parker" + "name": "crossbeam-utils_test_tests_atomic_cell" }, { - "name": "crossbeam-utils_device_test_tests_sharded_lock" + "name": "crossbeam-utils_test_tests_cache_padded" }, { - "name": "crossbeam-utils_device_test_tests_thread" + "name": "crossbeam-utils_test_tests_parker" }, { - "name": "crossbeam-utils_device_test_tests_wait_group" + "name": "crossbeam-utils_test_tests_sharded_lock" }, { - "name": "unicode-xid_device_test_src_lib" + "name": "crossbeam-utils_test_tests_thread" }, { - "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 |