diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:43:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:43:23 +0000 |
| commit | 23c0d926b9a116fe0a17458c4888cdf0549b6c83 (patch) | |
| tree | 5d4b2ea0d94dce003275b8af650e4933143caf82 | |
| parent | 5125a26022708de5735e384a12145e5aaa3d5cf2 (diff) | |
| parent | a78714aedce16defe9a9a4fa66bad9014deed9dd (diff) | |
| download | instant-23c0d926b9a116fe0a17458c4888cdf0549b6c83.tar.gz | |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 01239ab0e8 am: a78714aedc
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/instant/+/1912336
Change-Id: Ie3044c224e6be975021d175322597296dc77cd05
| -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 |