aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Scull <ascull@google.com>2022-06-07 16:21:11 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-06-07 16:21:11 +0000
commita4bcc73765d8354524f89e9ca9bcddccdeb26d56 (patch)
tree2b6a420f385d92cbbe309d151098716aeb9aed41
parent3d708503e4c8748379b487afb3ddd95860144fed (diff)
parent55b97a232f94c3454579dca9520defaa52cd9568 (diff)
downloadx509-parser-a4bcc73765d8354524f89e9ca9bcddccdeb26d56.tar.gz
Merge "Make availble to com.android.virt" am: f0aefbf5e7 am: fe7305571a am: 55b97a232f
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/x509-parser/+/2112009 Change-Id: I3b83c3a9de282659e5eb3d5150966cf71e68ab38 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 5239816..f847a0a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -56,4 +56,8 @@ rust_library {
"librusticata_macros",
"libthiserror",
],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
+ ],
}
diff --git a/cargo2android.json b/cargo2android.json
index c01fbda..b0b6639 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,7 +1,11 @@
{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
"dependency-blocklist": [
"data_encoding"
],
"device": true,
"run": true
-} \ No newline at end of file
+}