diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 15:28:00 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-12-15 15:28:00 +0000 |
commit | 42dd43a3addbfdf5033b106f73d822ef238cdcfd (patch) | |
tree | c438d5e508594ff96dcc6763baf825c2d1c8ed86 | |
parent | 816022661f45866012b078bd90afa482598dd6fe (diff) | |
parent | c6dafc6b822a6b33d84862a6bb9c414621786e8a (diff) | |
download | crossbeam-deque-42dd43a3addbfdf5033b106f73d822ef238cdcfd.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1
-rw-r--r-- | Android.bp | 82 | ||||
-rw-r--r-- | TEST_MAPPING | 32 | ||||
-rw-r--r-- | cargo2android.json | 5 |
3 files changed, 39 insertions, 80 deletions
@@ -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, diff --git a/TEST_MAPPING b/TEST_MAPPING index f9675a2..3601da1 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,35 +1,45 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ + "imports": [ { - "name": "base64_device_test_tests_decode" + "path": "external/rust/crates/base64" }, { - "name": "base64_device_test_tests_encode" + "path": "external/rust/crates/tinytemplate" }, { - "name": "base64_device_test_tests_helpers" + "path": "external/rust/crates/tinyvec" }, { - "name": "crossbeam-deque_device_test_src_lib" + "path": "external/rust/crates/unicode-xid" + } + ], + "presubmit": [ + { + "name": "crossbeam-deque_test_tests_fifo" }, { - "name": "crossbeam-deque_device_test_tests_fifo" + "name": "crossbeam-deque_test_tests_injector" }, { - "name": "crossbeam-deque_device_test_tests_injector" + "name": "crossbeam-deque_test_tests_lifo" }, { - "name": "crossbeam-deque_device_test_tests_lifo" + "name": "crossbeam-deque_test_tests_steal" + } + ], + "presubmit-rust": [ + { + "name": "crossbeam-deque_test_tests_fifo" }, { - "name": "crossbeam-deque_device_test_tests_steal" + "name": "crossbeam-deque_test_tests_injector" }, { - "name": "unicode-xid_device_test_src_lib" + "name": "crossbeam-deque_test_tests_lifo" }, { - "name": "unicode-xid_device_test_tests_exhaustive_tests" + "name": "crossbeam-deque_test_tests_steal" } ] } diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..d36fb44 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,5 @@ +{ + "device": true, + "run": true, + "tests": true +}
\ No newline at end of file |