diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 18:07:26 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 18:07:26 +0000 |
commit | 8fc103ab0cfd3b804ba493f21a4888088bbf8c87 (patch) | |
tree | 8416c3bcab37f203daa58e24ba6b63a433c70183 | |
parent | 01c796f39d355f5f0ba691c61503554736aaaf8a (diff) | |
parent | 47645a02786278e958a0a64e14c4e8b16a34d5e0 (diff) | |
download | crossbeam-channel-8fc103ab0cfd3b804ba493f21a4888088bbf8c87.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: e2ad837fe6 am: af05909c6f am: e9d5a03ef9 am: 47645a0278
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/crossbeam-channel/+/1912672
Change-Id: I63a58ed12516860a8a68cb4318cdbe74b789dc3c
-rw-r--r-- | Android.bp | 10 | ||||
-rw-r--r-- | TEST_MAPPING | 13 | ||||
-rw-r--r-- | cargo2android.json | 4 |
3 files changed, 12 insertions, 15 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --dependencies. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -46,6 +46,8 @@ rust_library { name: "libcrossbeam_channel", host_supported: true, crate_name: "crossbeam_channel", + cargo_env_compat: true, + cargo_pkg_version: "0.5.1", srcs: ["src/lib.rs"], edition: "2018", features: [ @@ -58,9 +60,3 @@ rust_library { "libcrossbeam_utils", ], } - -// dependent_library ["feature_list"] -// autocfg-1.0.1 -// cfg-if-1.0.0 -// crossbeam-utils-0.8.4 "lazy_static,std" -// lazy_static-1.4.0 diff --git a/TEST_MAPPING b/TEST_MAPPING index 05c6d70..3cbd48d 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,20 +1,17 @@ // 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": "unicode-xid_device_test_src_lib" - }, - { - "name": "unicode-xid_device_test_tests_exhaustive_tests" + "path": "external/rust/crates/unicode-xid" } ] } diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..bf78496 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,4 @@ +{ + "device": true, + "run": true +}
\ No newline at end of file |