aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Scull <ascull@google.com>2022-06-07 16:45:14 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-06-07 16:45:14 +0000
commit19332aa8704bba91382c95b9ef30da3345bbeda3 (patch)
tree7c5f1a1faae0128517ebbd3368f747fef0821945
parent743c4b63c3fdd96d8d701ea90b097ccd3c720a2d (diff)
parentaf51831a9eb8a25527b3326edf259177be4e8654 (diff)
downloadder-parser-19332aa8704bba91382c95b9ef30da3345bbeda3.tar.gz
Merge "Make availble to com.android.virt" am: 068f40b696 am: b07d1cfeb8 am: 35136a1715 am: af51831a9e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/der-parser/+/2113424 Change-Id: Ie10765814cf416055e745eeb88c695b3822cc64a 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 55296a0..fed7296 100644
--- a/Android.bp
+++ b/Android.bp
@@ -57,4 +57,8 @@ rust_library {
"librusticata_macros",
],
proc_macros: ["libder_oid_macro"],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
+ ],
}
diff --git a/cargo2android.json b/cargo2android.json
index 95d3b34..cfffddb 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,5 +1,9 @@
{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
"device": true,
"features": "bigint,std",
"run": true
-} \ No newline at end of file
+}