summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-10-08 22:07:00 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-08 22:07:00 +0000
commit49d54bdbf9e6f811587c51e0a9197ed457e31de0 (patch)
treeb8dfea35f56d37e40de09d46d317f69517469890
parent1aa0e1e3a4a21b6e7c1583a77e6cba8a543c9b01 (diff)
parent3fd42f3fb4584d997e5ccce3c51e5c69f2bb3f1b (diff)
downloadparking_lot_core-49d54bdbf9e6f811587c51e0a9197ed457e31de0.tar.gz
Merge "Add apex to parking_lot_core rust crate" am: c8765fd88e am: 08b89e5819 am: b1e85a9bcd am: 3fd42f3fb4
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/parking_lot_core/+/1850318 Change-Id: I276b26757f22142af82d971c8b4c30b6b5c53fe1
-rw-r--r--Android.bp6
-rw-r--r--cargo2android.json9
2 files changed, 14 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index dcf43e5..aa0f1a0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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