summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2023-02-04 10:40:51 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-02-04 10:40:51 +0000
commitbcb46fde64799fc7efdb3f48a2302a8d5bcfc6a5 (patch)
treee746ff444ad66ec586b41a49085c18d262e9bd0e
parent2b07540f632f4537c859477e2f79af400ca9229a (diff)
parentec8166541dfa5a8632ba2afea98cd8178c8e9b6c (diff)
downloadbouncycastle-bcb46fde64799fc7efdb3f48a2302a8d5bcfc6a5.tar.gz
Merge "Pin bouncycastle-bcpkix-unbundled to Java 11 for signapk" am: ec8166541dandroid-u-beta-1-gpl
Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/2419302 Change-Id: Iebe44e14af137283375d002859ec6e9f658207c0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 9e038632..fadb1f70 100644
--- a/Android.bp
+++ b/Android.bp
@@ -214,6 +214,8 @@ java_library {
libs: ["bouncycastle-unbundled"],
sdk_version: "core_current",
+ // b/267608166: Allow to be used by components targeting Java 11.
+ java_version: "11",
}
// Bouncycastle OCSP classes in the original org.bouncycastle package for use