aboutsummaryrefslogtreecommitdiff
path: root/Android.bp
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-11-29 14:03:26 -0800
committerJoel Galenson <jgalenson@google.com>2021-12-10 15:32:35 -0800
commitc6dafc6b822a6b33d84862a6bb9c414621786e8a (patch)
treec438d5e508594ff96dcc6763baf825c2d1c8ed86 /Android.bp
parentc0ca72201e2d4a09d061f9c742e0cc693ee15a77 (diff)
downloadcrossbeam-deque-c6dafc6b822a6b33d84862a6bb9c414621786e8a.tar.gz
Refresh Android.bp, cargo2android.json, TEST_MAPPING.
Test: None Change-Id: I159b1d8aed84c9e70944e7d79fd222233cf44108
Diffstat (limited to 'Android.bp')
-rw-r--r--Android.bp82
1 files changed, 13 insertions, 69 deletions
diff --git a/Android.bp b/Android.bp
index 9edb754..f89ca1b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --tests --dependencies.
+// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -42,7 +42,6 @@ license {
rust_defaults {
name: "crossbeam-deque_test_defaults",
crate_name: "crossbeam_deque",
- srcs: ["src/lib.rs"],
cargo_env_compat: true,
cargo_pkg_version: "0.8.1",
test_suites: ["general-tests"],
@@ -56,51 +55,17 @@ rust_defaults {
],
rustlibs: [
"libcfg_if",
+ "libcrossbeam_deque",
"libcrossbeam_epoch",
"libcrossbeam_utils",
"librand",
],
}
-rust_test_host {
- name: "crossbeam-deque_host_test_src_lib",
- defaults: ["crossbeam-deque_test_defaults"],
- test_options: {
- unit_test: true,
- },
-}
-
rust_test {
- name: "crossbeam-deque_device_test_src_lib",
+ name: "crossbeam-deque_test_tests_fifo",
defaults: ["crossbeam-deque_test_defaults"],
-}
-
-rust_defaults {
- name: "crossbeam-deque_test_defaults_crossbeam_deque",
- crate_name: "crossbeam_deque",
- cargo_env_compat: true,
- cargo_pkg_version: "0.8.1",
- test_suites: ["general-tests"],
- auto_gen_config: true,
- edition: "2018",
- features: [
- "crossbeam-epoch",
- "crossbeam-utils",
- "default",
- "std",
- ],
- rustlibs: [
- "libcfg_if",
- "libcrossbeam_deque",
- "libcrossbeam_epoch",
- "libcrossbeam_utils",
- "librand",
- ],
-}
-
-rust_test_host {
- name: "crossbeam-deque_host_test_tests_fifo",
- defaults: ["crossbeam-deque_test_defaults_crossbeam_deque"],
+ host_supported: true,
srcs: ["tests/fifo.rs"],
test_options: {
unit_test: true,
@@ -108,14 +73,9 @@ rust_test_host {
}
rust_test {
- name: "crossbeam-deque_device_test_tests_fifo",
- defaults: ["crossbeam-deque_test_defaults_crossbeam_deque"],
- srcs: ["tests/fifo.rs"],
-}
-
-rust_test_host {
- name: "crossbeam-deque_host_test_tests_injector",
- defaults: ["crossbeam-deque_test_defaults_crossbeam_deque"],
+ name: "crossbeam-deque_test_tests_injector",
+ defaults: ["crossbeam-deque_test_defaults"],
+ host_supported: true,
srcs: ["tests/injector.rs"],
test_options: {
unit_test: true,
@@ -123,14 +83,9 @@ rust_test_host {
}
rust_test {
- name: "crossbeam-deque_device_test_tests_injector",
- defaults: ["crossbeam-deque_test_defaults_crossbeam_deque"],
- srcs: ["tests/injector.rs"],
-}
-
-rust_test_host {
- name: "crossbeam-deque_host_test_tests_lifo",
- defaults: ["crossbeam-deque_test_defaults_crossbeam_deque"],
+ name: "crossbeam-deque_test_tests_lifo",
+ defaults: ["crossbeam-deque_test_defaults"],
+ host_supported: true,
srcs: ["tests/lifo.rs"],
test_options: {
unit_test: true,
@@ -138,26 +93,15 @@ rust_test_host {
}
rust_test {
- name: "crossbeam-deque_device_test_tests_lifo",
- defaults: ["crossbeam-deque_test_defaults_crossbeam_deque"],
- srcs: ["tests/lifo.rs"],
-}
-
-rust_test_host {
- name: "crossbeam-deque_host_test_tests_steal",
- defaults: ["crossbeam-deque_test_defaults_crossbeam_deque"],
+ name: "crossbeam-deque_test_tests_steal",
+ defaults: ["crossbeam-deque_test_defaults"],
+ host_supported: true,
srcs: ["tests/steal.rs"],
test_options: {
unit_test: true,
},
}
-rust_test {
- name: "crossbeam-deque_device_test_tests_steal",
- defaults: ["crossbeam-deque_test_defaults_crossbeam_deque"],
- srcs: ["tests/steal.rs"],
-}
-
rust_library {
name: "libcrossbeam_deque",
host_supported: true,