diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-10-08 21:25:51 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-08 21:25:51 +0000 |
commit | 55771dddc7c87d8fd261fb88741922c3b1b5c414 (patch) | |
tree | abb3e8d5ff52fe9415476abef84228ca8814b5f5 | |
parent | 8e7b4fde433c588a662b6eaf9570a05672129424 (diff) | |
parent | b4a4256dc43156209ca3d88280df020576973ccc (diff) | |
download | crossbeam-utils-55771dddc7c87d8fd261fb88741922c3b1b5c414.tar.gz |
Merge "Add apex to crossbeam-utils rust crate" am: b4be1265dd am: acf574400d am: b4a4256dc4
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/crossbeam-utils/+/1850754
Change-Id: Ie0ae8741735c179f458b21717858424fc3cde6dd
-rw-r--r-- | Android.bp | 54 | ||||
-rw-r--r-- | cargo2android.json | 9 |
2 files changed, 36 insertions, 27 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --dependencies --tests. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -40,9 +40,11 @@ license { } rust_defaults { - name: "crossbeam-utils_defaults", + name: "crossbeam-utils_test_defaults", crate_name: "crossbeam_utils", srcs: ["src/lib.rs"], + cargo_env_compat: true, + cargo_pkg_version: "0.8.5", test_suites: ["general-tests"], auto_gen_config: true, edition: "2018", @@ -60,7 +62,7 @@ rust_defaults { rust_test_host { name: "crossbeam-utils_host_test_src_lib", - defaults: ["crossbeam-utils_defaults"], + defaults: ["crossbeam-utils_test_defaults"], test_options: { unit_test: true, }, @@ -68,12 +70,14 @@ rust_test_host { rust_test { name: "crossbeam-utils_device_test_src_lib", - defaults: ["crossbeam-utils_defaults"], + defaults: ["crossbeam-utils_test_defaults"], } rust_defaults { - name: "crossbeam-utils_defaults_crossbeam_utils", + name: "crossbeam-utils_test_defaults_crossbeam_utils", crate_name: "crossbeam_utils", + cargo_env_compat: true, + cargo_pkg_version: "0.8.5", test_suites: ["general-tests"], auto_gen_config: true, edition: "2018", @@ -92,7 +96,7 @@ rust_defaults { rust_test_host { name: "crossbeam-utils_host_test_tests_atomic_cell", - defaults: ["crossbeam-utils_defaults_crossbeam_utils"], + defaults: ["crossbeam-utils_test_defaults_crossbeam_utils"], srcs: ["tests/atomic_cell.rs"], test_options: { unit_test: true, @@ -101,13 +105,13 @@ rust_test_host { rust_test { name: "crossbeam-utils_device_test_tests_atomic_cell", - defaults: ["crossbeam-utils_defaults_crossbeam_utils"], + 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_defaults_crossbeam_utils"], + defaults: ["crossbeam-utils_test_defaults_crossbeam_utils"], srcs: ["tests/cache_padded.rs"], test_options: { unit_test: true, @@ -116,13 +120,13 @@ rust_test_host { rust_test { name: "crossbeam-utils_device_test_tests_cache_padded", - defaults: ["crossbeam-utils_defaults_crossbeam_utils"], + 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_defaults_crossbeam_utils"], + defaults: ["crossbeam-utils_test_defaults_crossbeam_utils"], srcs: ["tests/parker.rs"], test_options: { unit_test: true, @@ -131,13 +135,13 @@ rust_test_host { rust_test { name: "crossbeam-utils_device_test_tests_parker", - defaults: ["crossbeam-utils_defaults_crossbeam_utils"], + 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_defaults_crossbeam_utils"], + defaults: ["crossbeam-utils_test_defaults_crossbeam_utils"], srcs: ["tests/sharded_lock.rs"], test_options: { unit_test: true, @@ -146,13 +150,13 @@ rust_test_host { rust_test { name: "crossbeam-utils_device_test_tests_sharded_lock", - defaults: ["crossbeam-utils_defaults_crossbeam_utils"], + 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_defaults_crossbeam_utils"], + defaults: ["crossbeam-utils_test_defaults_crossbeam_utils"], srcs: ["tests/thread.rs"], test_options: { unit_test: true, @@ -161,13 +165,13 @@ rust_test_host { rust_test { name: "crossbeam-utils_device_test_tests_thread", - defaults: ["crossbeam-utils_defaults_crossbeam_utils"], + 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_defaults_crossbeam_utils"], + defaults: ["crossbeam-utils_test_defaults_crossbeam_utils"], srcs: ["tests/wait_group.rs"], test_options: { unit_test: true, @@ -176,7 +180,7 @@ rust_test_host { rust_test { name: "crossbeam-utils_device_test_tests_wait_group", - defaults: ["crossbeam-utils_defaults_crossbeam_utils"], + defaults: ["crossbeam-utils_test_defaults_crossbeam_utils"], srcs: ["tests/wait_group.rs"], } @@ -184,6 +188,8 @@ rust_library { name: "libcrossbeam_utils", host_supported: true, crate_name: "crossbeam_utils", + cargo_env_compat: true, + cargo_pkg_version: "0.8.5", srcs: ["src/lib.rs"], edition: "2018", features: [ @@ -195,14 +201,8 @@ rust_library { "libcfg_if", "liblazy_static", ], + apex_available: [ + "//apex_available:platform", + "com.android.virt", + ], } - -// dependent_library ["feature_list"] -// cfg-if-1.0.0 -// getrandom-0.2.3 "std" -// lazy_static-1.4.0 -// libc-0.2.97 -// ppv-lite86-0.2.10 "simd,std" -// rand-0.8.4 "alloc,default,getrandom,libc,rand_chacha,rand_hc,std,std_rng" -// rand_chacha-0.3.1 "std" -// rand_core-0.6.3 "alloc,getrandom,std" diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..86c645c --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,9 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.virt" + ], + "device": true, + "run": true, + "tests": true + }
\ No newline at end of file |