aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-10-08 21:25:47 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-08 21:25:47 +0000
commit60626a7c5046dd9a9936136bca07625a5d7cbde6 (patch)
tree0a8aff345b1389aaa5f8b746b8fd6c4020cbb061
parent5f0538e371149c09291c1a12170d06a15e7949e5 (diff)
parent1b3e544c2ca71340900f5069caa2f41b8a325e44 (diff)
downloadash-60626a7c5046dd9a9936136bca07625a5d7cbde6.tar.gz
Merge "Add apex to ash rust crate" am: 08cf2295e2 am: 19e412a3a0 am: 1b3e544c2c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/ash/+/1850671 Change-Id: If31e0c1f70c1ca38b1f4dadb446d8cebbbab89a2
-rw-r--r--Android.bp4
-rw-r--r--cargo2android.json4
2 files changed, 8 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 75157e8..aea7efa 100644
--- a/Android.bp
+++ b/Android.bp
@@ -132,4 +132,8 @@ rust_library {
rustlibs: [
"liblibloading",
],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
+ ],
}
diff --git a/cargo2android.json b/cargo2android.json
index d36fb44..6e516e0 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,4 +1,8 @@
{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
"device": true,
"run": true,
"tests": true