aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-10-08 22:41:25 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-08 22:41:25 +0000
commitbd1e3ec09bc17c2804f4400472236de8fe456822 (patch)
tree78365b74bda6fc71bb1941b606057e15d687d074
parent6f217e6df9814addbd9c4c3cb5af394a90f93bb1 (diff)
parent1aa001bec7db58867612f2ed00fb1f8ab9ff9669 (diff)
downloadvulkano-bd1e3ec09bc17c2804f4400472236de8fe456822.tar.gz
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
-rw-r--r--Android.bp6
-rw-r--r--cargo2android.json4
2 files changed, 8 insertions, 2 deletions
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 @@ rust_library {
"libshared_library",
"libsmallvec",
],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
+ ],
}
rust_defaults {
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,