diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 17:27:28 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 17:27:28 +0000 |
commit | 88b34993eeef4faac220578a593635522f6f2640 (patch) | |
tree | afcbc792aecffdb2c0d398a07381abdc0e2003ae | |
parent | aa65188ef1f0ce18d7fab4e87aab987f996cf2b1 (diff) | |
parent | 27bafcdc9ae9ea9bd8bca92a9ae36c0d161bca95 (diff) | |
download | clang-sys-88b34993eeef4faac220578a593635522f6f2640.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 9776ef82a5 am: 5f7f7bb1e9 am: 27bafcdc9a
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/clang-sys/+/1912049
Change-Id: I0780780cf346e456eacbb587a875ef3dc20132d9
-rw-r--r-- | Android.bp | 2 | ||||
-rw-r--r-- | TEST_MAPPING | 13 | ||||
-rw-r--r-- | cargo2android.json | 5 |
3 files changed, 16 insertions, 4 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --features=runtime,clang_10_0 --copy-out. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { 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..a0f1a8e --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,5 @@ +{ + "copy-out": true, + "features": "runtime,clang_10_0", + "run": true +}
\ No newline at end of file |