diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-10-08 22:17:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-08 22:17:44 +0000 |
| commit | 9153f3b825ca3f1148cddd4d01b2e0470f1ddb7f (patch) | |
| tree | b8dfea35f56d37e40de09d46d317f69517469890 | |
| parent | 741741b0f87dc70f266a96bd3469e6f4f2ed7861 (diff) | |
| parent | 49d54bdbf9e6f811587c51e0a9197ed457e31de0 (diff) | |
| download | parking_lot_core-9153f3b825ca3f1148cddd4d01b2e0470f1ddb7f.tar.gz | |
Merge "Add apex to parking_lot_core rust crate" am: c8765fd88e am: 08b89e5819 am: b1e85a9bcd am: 3fd42f3fb4 am: 49d54bdbf9
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/parking_lot_core/+/1850318
Change-Id: I38fdb564ec0921abbc6473df032eefa11e22c1d8
| -rw-r--r-- | Android.bp | 6 | ||||
| -rw-r--r-- | cargo2android.json | 9 |
2 files changed, 14 insertions, 1 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --tests. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -54,6 +54,10 @@ rust_library { "liblibc", "libsmallvec", ], + apex_available: [ + "//apex_available:platform", + "com.android.virt", + ], } rust_defaults { diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..d28888a --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,9 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.virt" + ], + "device": true, + "run": true, + "tests": true +}
\ No newline at end of file |