diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-12-15 17:27:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 17:27:50 +0000 |
| commit | a8cc19dcbbbdaf59691dba6ee22d6f40352d7b65 (patch) | |
| tree | a1f8d4d3bb32c82cbfc9afbe6fe7949ab517d67f | |
| parent | dd43a7c19d692146094b8646d40f2a5d7ba46afa (diff) | |
| parent | 90de8516325ea19a5a9a7a23a22c42b2bec5cfe5 (diff) | |
| download | bstr-a8cc19dcbbbdaf59691dba6ee22d6f40352d7b65.tar.gz | |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: e433916950 am: 27c7e149fd am: 90de851632
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/bstr/+/1912479
Change-Id: I2c51877c273d6317debb6cf14c0bf08c1e05fddc
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | TEST_MAPPING | 13 | ||||
| -rw-r--r-- | cargo2android.json | 4 |
3 files changed, 10 insertions, 9 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device. +// 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 05c6d70..3cbd48d 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,20 +1,17 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ + "imports": [ { - "name": "base64_device_test_tests_decode" + "path": "external/rust/crates/base64" }, { - "name": "base64_device_test_tests_encode" + "path": "external/rust/crates/tinytemplate" }, { - "name": "base64_device_test_tests_helpers" + "path": "external/rust/crates/tinyvec" }, { - "name": "unicode-xid_device_test_src_lib" - }, - { - "name": "unicode-xid_device_test_tests_exhaustive_tests" + "path": "external/rust/crates/unicode-xid" } ] } 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 |