aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-15 10:15:21 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-15 10:15:21 +0000
commit442571ce6886d0947e97cd0508aed60223e926c1 (patch)
treec96c4630d9462bf6571ee628049c3078b332fc2e
parent2a544a9ea30a47bdd1d342ee6a101252230bb8bb (diff)
parent8524b7762760d5476b3034330d311875e0926512 (diff)
downloadcrossbeam-deque-442571ce6886d0947e97cd0508aed60223e926c1.tar.gz
Migrate to cargo_embargo. am: 8524b77627
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/crossbeam-deque/+/2828197 Change-Id: I7a4ff1926c2c315054dbc237d7eb0dcb7689c259 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp83
-rw-r--r--cargo2android.json5
-rw-r--r--cargo_embargo.json3
3 files changed, 69 insertions, 22 deletions
diff --git a/Android.bp b/Android.bp
index 9187a9a..e43b8b2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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-deque_test_defaults",
- crate_name: "crossbeam_deque",
+rust_test {
+ name: "crossbeam-deque_test_tests_fifo",
+ host_supported: true,
+ crate_name: "fifo",
cargo_env_compat: true,
cargo_pkg_version: "0.8.3",
+ srcs: ["tests/fifo.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2018",
features: [
"crossbeam-epoch",
@@ -63,43 +68,87 @@ rust_defaults {
}
rust_test {
- name: "crossbeam-deque_test_tests_fifo",
- defaults: ["crossbeam-deque_test_defaults"],
- host_supported: true,
- srcs: ["tests/fifo.rs"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
name: "crossbeam-deque_test_tests_injector",
- defaults: ["crossbeam-deque_test_defaults"],
host_supported: true,
+ crate_name: "injector",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.8.3",
srcs: ["tests/injector.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
+ edition: "2018",
+ features: [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+ "default",
+ "std",
+ ],
+ rustlibs: [
+ "libcfg_if",
+ "libcrossbeam_deque",
+ "libcrossbeam_epoch",
+ "libcrossbeam_utils",
+ "librand",
+ ],
}
rust_test {
name: "crossbeam-deque_test_tests_lifo",
- defaults: ["crossbeam-deque_test_defaults"],
host_supported: true,
+ crate_name: "lifo",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.8.3",
srcs: ["tests/lifo.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
+ edition: "2018",
+ features: [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+ "default",
+ "std",
+ ],
+ rustlibs: [
+ "libcfg_if",
+ "libcrossbeam_deque",
+ "libcrossbeam_epoch",
+ "libcrossbeam_utils",
+ "librand",
+ ],
}
rust_test {
name: "crossbeam-deque_test_tests_steal",
- defaults: ["crossbeam-deque_test_defaults"],
host_supported: true,
+ crate_name: "steal",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.8.3",
srcs: ["tests/steal.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
+ edition: "2018",
+ features: [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+ "default",
+ "std",
+ ],
+ rustlibs: [
+ "libcfg_if",
+ "libcrossbeam_deque",
+ "libcrossbeam_epoch",
+ "libcrossbeam_utils",
+ "librand",
+ ],
}
rust_library {
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index d36fb44..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "device": true,
- "run": true,
- "tests": true
-} \ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..9a0a579
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,3 @@
+{
+ "tests": true
+}