aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Scull <ascull@google.com>2022-06-07 17:13:40 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-06-07 17:13:40 +0000
commit441f9cc7eeb69f0fc653465d57d8fdf0557d58e1 (patch)
treed6b00150d04706c4a2b97f85c38c59b370680a54
parent294a417049ad108cfdb805bc4788661e17331b35 (diff)
parentbdc1502cf403a8486e15d83ce38df478006f2c7f (diff)
downloadoid-registry-441f9cc7eeb69f0fc653465d57d8fdf0557d58e1.tar.gz
Merge "Make availble to com.android.virt" am: 4dbac81946 am: a6112087d3 am: ed99d77fd5 am: ca057a8874 am: bdc1502cf4
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/oid-registry/+/2112008 Change-Id: I46e403c6160a29f79f2ac54a1b69d6efa683ad7b 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 4d1a9e6..b85e7ac 100644
--- a/Android.bp
+++ b/Android.bp
@@ -69,6 +69,10 @@ rust_library {
rustlibs: [
"libder_parser",
],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
+ ],
}
rust_test {
diff --git a/cargo2android.json b/cargo2android.json
index 183bd42..322cd70 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,7 +1,11 @@
{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
"copy-out": true,
"device": true,
"features": "crypto,x509",
"run": true,
"tests": true
-} \ No newline at end of file
+}