diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-10-08 22:12:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-08 22:12:03 +0000 |
| commit | f321489254fa8c841b2218afc40ac9ed7e1b69f1 (patch) | |
| tree | ae98cb0dce92af914d211d8ecc00942748f9611e | |
| parent | b8fb64aeff1e50349030840e7c5561311623e9a9 (diff) | |
| parent | f21fa161ce843736a085ec870378c5b1652c4bfa (diff) | |
| download | parking_lot-f321489254fa8c841b2218afc40ac9ed7e1b69f1.tar.gz | |
Merge "Add apex to parking_lot rust crate" am: ecbfe05567 am: 87be375f77 am: f21fa161ce
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/parking_lot/+/1850758
Change-Id: Idc6a6e2af10e0243d369bde6c386534d07c1d0b2
| -rw-r--r-- | Android.bp | 6 | ||||
| -rw-r--r-- | cargo2android.json | 8 |
2 files changed, 13 insertions, 1 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 { @@ -51,4 +51,8 @@ rust_library { "liblock_api", "libparking_lot_core", ], + apex_available: [ + "//apex_available:platform", + "com.android.virt", + ], } diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..340481e --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,8 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.virt" + ], + "device": true, + "run": true +}
\ No newline at end of file |