diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:43:07 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:43:07 +0000 |
commit | 2bb21acdf7703ac8c913aa8019bfb73ee9dab825 (patch) | |
tree | 9eb9b985863843fbf9332a33951797aca28db187 | |
parent | fdbed56a11f9e5552c1dd56747d7621417c96595 (diff) | |
parent | e052038e134e253ab75802246ae6a895813bc058 (diff) | |
download | hashbrown-2bb21acdf7703ac8c913aa8019bfb73ee9dab825.tar.gz |
Refresh Android.bp, cargo2android.json, TEST_MAPPING. am: 49ea629403 am: e052038e13
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/hashbrown/+/1911933
Change-Id: Ib683616ea60b664e6c502b190e42acd362e35eaa
-rw-r--r-- | Android.bp | 13 | ||||
-rw-r--r-- | TEST_MAPPING | 8 | ||||
-rw-r--r-- | cargo2android.json | 4 |
3 files changed, 16 insertions, 9 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --device --run --dependencies. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -39,8 +39,11 @@ license { rust_library { name: "libhashbrown", + // has rustc warnings host_supported: true, crate_name: "hashbrown", + cargo_env_compat: true, + cargo_pkg_version: "0.11.2", srcs: ["src/lib.rs"], edition: "2018", features: [ @@ -52,11 +55,3 @@ rust_library { "libahash", ], } - -// dependent_library ["feature_list"] -// ahash-0.7.2 "folded_multiply,runtime-rng,specialize" -// cfg-if-1.0.0 -// getrandom-0.2.2 -// libc-0.2.92 "default,std" -// once_cell-1.7.2 "alloc,race,unstable" -// version_check-0.9.3 diff --git a/TEST_MAPPING b/TEST_MAPPING index 48ee89d..91f37bf 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -7,5 +7,13 @@ { "name": "legacykeystore_test" } + ], + "presubmit-rust": [ + { + "name": "keystore2_test" + }, + { + "name": "legacykeystore_test" + } ] } 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 |