commit ecbfe05567403eecb6e9524e75ce0beb7340b4a4
author Treehugger Robot <treehugger-gerrit@google.com> Fri Oct 08 21:30:44 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 08 21:30:44 2021 +0000
tree ae98cb0dce92af914d211d8ecc00942748f9611e
parent a31dc0fdc5b21e553091345c2c0d3da7a6f368e2
parent c48f77e5b055870d1d0a91ab02808d859aa11e7f

Merge "Add apex to parking_lot rust crate"

Android.bp

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 @@
         "liblock_api",
         "libparking_lot_core",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
 }

cargo2android.json

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