diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-12-15 18:07:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 18:07:03 +0000 |
| commit | 41239a76c66a5657e97ddf7a68d2c144af35203b (patch) | |
| tree | 5d4b2ea0d94dce003275b8af650e4933143caf82 | |
| parent | 0156366dc87e742d39c419b1a9abebc5c730b182 (diff) | |
| parent | 88d62f957d81690bb085ca41bf3fa59799b461ff (diff) | |
| download | instant-41239a76c66a5657e97ddf7a68d2c144af35203b.tar.gz | |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 01239ab0e8 am: a78714aedc am: 23c0d926b9 am: 88d62f957d
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/instant/+/1912336
Change-Id: I14838e669b5e4f719bc81c1eecb9679b8d4566f4
| -rw-r--r-- | TEST_MAPPING | 7 | ||||
| -rw-r--r-- | cargo2android.json | 12 |
2 files changed, 11 insertions, 8 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING index 98e9fcf..83a6c6c 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,8 +1,11 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ + "imports": [ { - "name": "parking_lot_core_device_test_src_lib" + "path": "external/rust/crates/parking_lot_core" + }, + { + "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 |