diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:02:01 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:02:01 +0000 |
commit | 2e531088a92bf791e86b097d8212551708e919f9 (patch) | |
tree | 2ea0e76815a667dd8445edec8840f25fd980fc12 | |
parent | 2a37e1776d5a5987fd0e7e1380abf2cd86ab2fa8 (diff) | |
parent | 4be8607c6294ac1430edb4a2f42563dae5130239 (diff) | |
download | which-2e531088a92bf791e86b097d8212551708e919f9.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 4be8607c62
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/which/+/1912836
Change-Id: I6e7bc718a80cdc6fbdf179898ae71ad1de986ba2
-rw-r--r-- | Android.bp | 8 | ||||
-rw-r--r-- | TEST_MAPPING | 13 | ||||
-rw-r--r-- | cargo2android.json | 5 |
3 files changed, 18 insertions, 8 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --dependencies --device --features=. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -22,6 +22,8 @@ rust_library { name: "libwhich", host_supported: true, crate_name: "which", + cargo_env_compat: true, + cargo_pkg_version: "4.2.2", srcs: ["src/lib.rs"], edition: "2018", rustlibs: [ @@ -29,7 +31,3 @@ rust_library { "liblibc", ], } - -// dependent_library ["feature_list"] -// either-1.6.1 "default,use_std" -// libc-0.2.98 "default,std" diff --git a/TEST_MAPPING b/TEST_MAPPING index d87563d..e4ec3b3 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,17 +1,24 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { + "imports": [ + { + "path": "external/rust/crates/libsqlite3-sys" + } + ], "presubmit": [ { "name": "keystore2_test" }, { "name": "legacykeystore_test" - }, + } + ], + "presubmit-rust": [ { - "name": "libsqlite3-sys_device_test_src_lib" + "name": "keystore2_test" }, { - "name": "libsqlite3_bindgen_test" + "name": "legacykeystore_test" } ] } diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..5fd6c55 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,5 @@ +{ + "device": true, + "features": "", + "run": true +}
\ No newline at end of file |