diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-12-15 17:27:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 17:27:10 +0000 |
| commit | 83f9c898e1f01e716bce1e437d3a6e83ff29b33b (patch) | |
| tree | 2427677ba452aa0b7da7869354d288b25d78cab7 | |
| parent | f1a313572f4fc877e773dd16d9e0e9ec1849cfe9 (diff) | |
| parent | 2e741540687488125af0c0a4fd422115a3f85c7e (diff) | |
| download | parking_lot-83f9c898e1f01e716bce1e437d3a6e83ff29b33b.tar.gz | |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 117c52ee47 am: 7222e9fbfa am: 2e74154068
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/parking_lot/+/1912527
Change-Id: Ie8cc768f9532c184136f9317886f2b5ab17c9dd3
| -rw-r--r-- | TEST_MAPPING | 8 | ||||
| -rw-r--r-- | cargo2android.json | 12 |
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 |