diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-16 02:07:06 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-16 02:07:06 +0000 |
commit | d2eaf68e873958bc3c91064aac03a21a7ae36e89 (patch) | |
tree | 3c2abb16a61cdcb6c665836da86505adbc9db9e0 | |
parent | 5f533e026a9a2ebb762cd31802c22d51631b8502 (diff) | |
parent | 0927990edf14645203e733b6556a968b7f4177f6 (diff) | |
download | hashlink-d2eaf68e873958bc3c91064aac03a21a7ae36e89.tar.gz |
Snap for 8006021 from 0927990edf14645203e733b6556a968b7f4177f6 to tm-releaseandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r18android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-13.0.0_r9android-platform-13.0.0_r8android-platform-13.0.0_r7android-platform-13.0.0_r6android-platform-13.0.0_r5android-platform-13.0.0_r4android-platform-13.0.0_r3android-platform-13.0.0_r20android-platform-13.0.0_r2android-platform-13.0.0_r19android-platform-13.0.0_r18android-platform-13.0.0_r17android-platform-13.0.0_r16android-platform-13.0.0_r15android-platform-13.0.0_r14android-platform-13.0.0_r13android-platform-13.0.0_r12android-platform-13.0.0_r11android-platform-13.0.0_r10android-platform-13.0.0_r1android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-releaseandroid13-platform-releaseandroid13-gsi
Change-Id: I90f9167033072ef52fc355b2b684693ee0cc410a
-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 |