commit bd1e3ec09bc17c2804f4400472236de8fe456822
author Treehugger Robot <treehugger-gerrit@google.com> Fri Oct 08 22:41:25 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Oct 08 22:41:25 2021 +0000
tree 78365b74bda6fc71bb1941b606057e15d687d074
parent 6f217e6df9814addbd9c4c3cb5af394a90f93bb1
parent 1aa001bec7db58867612f2ed00fb1f8ab9ff9669

Merge "Add apex to vulkano rust crate" am: 264a2c4f76 am: bee47b0d5a am: 8b3422bb3b am: 1aa001bec7

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vulkano/+/1850644

Change-Id: I4dc945cfe00229acfdcc739995d276105e26955e

Android.bp

diff --git a/Android.bp b/Android.bp
index faaa6a1..fa9215f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
 // This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
-
-
 package {
     default_applicable_licenses: ["external_rust_crates_vulkano_license"],
 }
@@ -68,6 +66,10 @@
         "libshared_library",
         "libsmallvec",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
 }
 
 rust_defaults {

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
index 4d9f28e..d6a9e94 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,4 +1,8 @@
 {
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
   "copy-out": true,
   "device": true,
   "run": true,