diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:43:36 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:43:36 +0000 |
commit | 86660f3dc0cb8fc7ef9cc979bd3e614caf750375 (patch) | |
tree | 18d4fe0356f467e85e883b5be7d7342c6c87396c | |
parent | 405c1f7345493e3bd8f1d009e06d808b25dd1f09 (diff) | |
parent | e97c5fcaf6d7dfb7dabf948de43c1116beb846cb (diff) | |
download | rayon-86660f3dc0cb8fc7ef9cc979bd3e614caf750375.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: d6c721b28e am: e97c5fcaf6
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rayon/+/1912007
Change-Id: I4b32ea75a17812940341f34c8ba6640ca57ae9fa
-rw-r--r-- | Android.bp | 19 | ||||
-rw-r--r-- | TEST_MAPPING | 13 | ||||
-rw-r--r-- | cargo2android.json | 4 |
3 files changed, 12 insertions, 24 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 { @@ -41,6 +41,8 @@ rust_library { name: "librayon", host_supported: true, crate_name: "rayon", + cargo_env_compat: true, + cargo_pkg_version: "1.5.1", srcs: ["src/lib.rs"], edition: "2018", cfgs: [ @@ -53,18 +55,3 @@ rust_library { "librayon_core", ], } - -// dependent_library ["feature_list"] -// autocfg-1.0.1 -// cfg-if-1.0.0 -// crossbeam-channel-0.5.1 "crossbeam-utils,default,std" -// crossbeam-deque-0.8.0 "crossbeam-epoch,crossbeam-utils,default,std" -// crossbeam-epoch-0.9.4 "alloc,lazy_static,std" -// crossbeam-utils-0.8.4 "default,lazy_static,std" -// either-1.6.1 -// lazy_static-1.4.0 -// libc-0.2.94 "default,std" -// memoffset-0.6.3 "default" -// num_cpus-1.13.0 -// rayon-core-1.9.1 -// scopeguard-1.1.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 |