aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-10-08 22:21:41 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-08 22:21:41 +0000
commitf1a313572f4fc877e773dd16d9e0e9ec1849cfe9 (patch)
treeae98cb0dce92af914d211d8ecc00942748f9611e
parent583ad6893ec37dd3c856330a5d6b512bc745984f (diff)
parentf321489254fa8c841b2218afc40ac9ed7e1b69f1 (diff)
downloadparking_lot-f1a313572f4fc877e773dd16d9e0e9ec1849cfe9.tar.gz
Merge "Add apex to parking_lot rust crate" am: ecbfe05567 am: 87be375f77 am: f21fa161ce am: f321489254
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/parking_lot/+/1850758 Change-Id: I58be49717a21c90a40160fc25ca8695639e1edbb
-rw-r--r--Android.bp6
-rw-r--r--cargo2android.json8
2 files changed, 13 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index d41cebb..8d3edd3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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