aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-12-15 18:06:42 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-12-15 18:06:42 +0000
commit577a6ccc5fc9ed1fa72e6041aa76a1fa99551afc (patch)
tree2427677ba452aa0b7da7869354d288b25d78cab7
parent3947cd8c17bc616811267e801c4233ec09f08f72 (diff)
parent83f9c898e1f01e716bce1e437d3a6e83ff29b33b (diff)
downloadparking_lot-577a6ccc5fc9ed1fa72e6041aa76a1fa99551afc.tar.gz
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 117c52ee47 am: 7222e9fbfa am: 2e74154068 am: 83f9c898e1
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/parking_lot/+/1912527 Change-Id: Idd94070e43007dbda981634f3f73b904b29a762f
-rw-r--r--TEST_MAPPING8
-rw-r--r--cargo2android.json12
2 files changed, 14 insertions, 6 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..f439cf8
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,8 @@
+// Generated by update_crate_tests.py for tests that depend on this crate.
+{
+ "imports": [
+ {
+ "path": "external/rust/crates/vulkano"
+ }
+ ]
+}
diff --git a/cargo2android.json b/cargo2android.json
index 340481e..707d26c 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,8 +1,8 @@
{
- "apex-available": [
- "//apex_available:platform",
- "com.android.virt"
- ],
- "device": true,
- "run": true
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "device": true,
+ "run": true
} \ No newline at end of file