diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 15:28:00 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-12-15 15:28:00 +0000 |
commit | 9776ef82a5bb62a362aa1b2143996e74716f1fc2 (patch) | |
tree | afcbc792aecffdb2c0d398a07381abdc0e2003ae | |
parent | 59bd07db87006383758bc3ad2712cf59006ef05c (diff) | |
parent | 4d4c04cfde3e779633350cd33c3ef17da97d0ad1 (diff) | |
download | clang-sys-android-s-qpr3-beta-1.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1
-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 |