aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Scull <ascull@google.com>2022-06-07 16:21:12 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-06-07 16:21:12 +0000
commitd63b95b2df953e0403c0c1b8acdba8eddff61a82 (patch)
tree87794e2ebd25d78ed52268a08b0ce421ee8421a6
parentbb2bf1248113cd5b9be6d5fa09fdc660f442d144 (diff)
parent459d64dc013be338ab79fcf48bc3c1e180c100cc (diff)
downloadrusticata-macros-d63b95b2df953e0403c0c1b8acdba8eddff61a82.tar.gz
Merge "Make availble to com.android.virt" am: 0a427f8b16 am: a882d76603 am: 459d64dc01
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusticata-macros/+/2111848 Change-Id: I0ffdf91822349f74dfdb6580a8108751c59a9d4b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp4
-rw-r--r--cargo2android.json6
2 files changed, 9 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 412407c..3d716a2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -50,6 +50,10 @@ rust_library {
rustlibs: [
"libnom",
],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
+ ],
}
rust_test {
diff --git a/cargo2android.json b/cargo2android.json
index d36fb44..8e490de 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,5 +1,9 @@
{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
"device": true,
"run": true,
"tests": true
-} \ No newline at end of file
+}