aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Scull <ascull@google.com>2022-06-07 16:45:15 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-06-07 16:45:15 +0000
commit84b467454df306c94bb274c75aaeab79b884a375 (patch)
tree7c980ff05a90446965676bf36a73dce901f1a5ad
parentcf661d1dcf3260338c4a205f195502a9d6472ffc (diff)
parent48b04d31535dac8f1e989c086c3c12c2bdedfc12 (diff)
downloadnom-84b467454df306c94bb274c75aaeab79b884a375.tar.gz
Merge "Make availble to com.android.virt" am: 02d9db2497 am: 982838552c am: 96efdae340 am: 48b04d3153
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/nom/+/2112007 Change-Id: I88c337efbdfda46fcf3ca0b0eebad6f77baa285e 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 6fd9d6f..6c36bec 100644
--- a/Android.bp
+++ b/Android.bp
@@ -35,4 +35,8 @@ rust_library {
"libmemchr",
"libminimal_lexical",
],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
+ ],
}
diff --git a/cargo2android.json b/cargo2android.json
index 5fb7e33..73b74df 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,5 +1,9 @@
{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
"device": true,
"features": "alloc,std",
"run": true
-} \ No newline at end of file
+}