aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Scull <ascull@google.com>2022-06-07 15:44:42 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-06-07 15:44:42 +0000
commitfe7305571a0f53573edd0d093e8f20e60536b443 (patch)
tree2b6a420f385d92cbbe309d151098716aeb9aed41
parentec000569f5ba132fae5fe5ef7d3335c071b84eb0 (diff)
parentf0aefbf5e7d50e4d8f9465e5d4f41033ad892ebe (diff)
downloadx509-parser-fe7305571a0f53573edd0d093e8f20e60536b443.tar.gz
Merge "Make availble to com.android.virt" am: f0aefbf5e7
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/x509-parser/+/2112009 Change-Id: I4a20086f9a3f80c4c666c2a84a74e88ad5d8f95b 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
+}