aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Maurer <mmaurer@google.com>2023-03-09 16:09:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-03-09 16:09:49 +0000
commit42df7dd49ce64b5f10991bb666edaff966647237 (patch)
treec2e3e3f90088225b46ad08cf315a97c8c4dc1ec1
parent49884159b0f14ff616961dd0f1f4df1f2a24b098 (diff)
parent91786d26c8a83708fcc917e0ec5b7566017d3a2c (diff)
downloadwebpki-42df7dd49ce64b5f10991bb666edaff966647237.tar.gz
Make webpki available to product and vendor am: 44a849fcef am: 91786d26c8
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/webpki/+/2476533 Change-Id: I84f579e4cb15790efb5df64684a31d9a0cca592f 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, 8 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index dc3b197..76da448 100644
--- a/Android.bp
+++ b/Android.bp
@@ -47,6 +47,10 @@ rust_library {
"libring",
"libuntrusted",
],
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
}
rust_test {
diff --git a/cargo2android.json b/cargo2android.json
index b1863fd..e0aa06c 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -2,5 +2,7 @@
"device": true,
"features": "alloc,std",
"run": true,
- "tests": true
-} \ No newline at end of file
+ "tests": true,
+ "vendor-available": false,
+ "product-available": false
+}