Merge "Add apex to parking_lot_core rust crate" am: c8765fd88e am: 08b89e5819
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/parking_lot_core/+/1850318
Change-Id: Ief54105389fdb55d0dea709376d2fe6c51eda497
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 @@
"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
