diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-12-15 17:27:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 17:27:25 +0000 |
| commit | 47903fb61544e520b01b0f83b6f5c3c65f4589b5 (patch) | |
| tree | d6404823f9e67c478bb2986961f84a05ccdd1252 | |
| parent | 9e01ae26defba27522eaeeeef23119286f8e4cd9 (diff) | |
| parent | d7b28d8ec187f25dab67fb1a3df8ff2c3c016d3e (diff) | |
| download | rusqlite-47903fb61544e520b01b0f83b6f5c3c65f4589b5.tar.gz | |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: e3192e4d6d am: 2a0fc9eb6e am: d7b28d8ec1
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1912660
Change-Id: Id35af50b752d3a4c48cbf66a08b1a4622467c83d
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | TEST_MAPPING | 8 | ||||
| -rw-r--r-- | cargo2android.json | 6 |
3 files changed, 15 insertions, 1 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --device --run --features=modern_sqlite,trace --add-toplevel-block cargo2android-extra-module.bp. +// 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 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..b515003 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,6 @@ +{ + "add-toplevel-block": "cargo2android-extra-module.bp", + "device": true, + "features": "modern_sqlite,trace", + "run": true +}
\ No newline at end of file |