diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:02:37 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:02:37 +0000 |
commit | 5754917cf84df222276659f715c56a46375d8531 (patch) | |
tree | 3c2abb16a61cdcb6c665836da86505adbc9db9e0 | |
parent | 0d4ddeb31266076d40eb9fe248ffa5b97729dce9 (diff) | |
parent | 86898edaca2ebd5a8a93b827ef961e6077781890 (diff) | |
download | hashlink-5754917cf84df222276659f715c56a46375d8531.tar.gz |
Refresh Android.bp, cargo2android.json, TEST_MAPPING. am: 86898edaca
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/hashlink/+/1912712
Change-Id: Ie21820d2c470040fda538ac8308c4ed86f7a280f
-rw-r--r-- | Android.bp | 13 | ||||
-rw-r--r-- | TEST_MAPPING | 8 | ||||
-rw-r--r-- | cargo2android.json | 4 |
3 files changed, 15 insertions, 10 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 { @@ -41,18 +41,11 @@ rust_library { name: "libhashlink", host_supported: true, crate_name: "hashlink", + cargo_env_compat: true, + cargo_pkg_version: "0.7.0", srcs: ["src/lib.rs"], edition: "2018", rustlibs: [ "libhashbrown", ], } - -// dependent_library ["feature_list"] -// ahash-0.7.2 "folded_multiply,runtime-rng,specialize" -// cfg-if-1.0.0 -// getrandom-0.2.2 -// hashbrown-0.11.2 "ahash,default,inline-more" -// libc-0.2.94 -// 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 |