aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-03-08 06:06:28 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-03-08 06:06:28 +0000
commit73caf6e274520ccb7a73a4242853e1af5635edff (patch)
tree758f0aef9f1294472ac24358629903149ce7c92b
parent9ab36127f7069603097593dd3a0080a552167a1b (diff)
parent41682b66d624278551e3abe91b3106728fcde16a (diff)
downloadbrotli-android14-gsi.tar.gz
Snap for 9705326 from a120b2bad1c8582f94033b313499f2a00446de67 to udc-release am: 41682b66d6android14-gsi
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/brotli/+/21896571 Change-Id: If0d087ef7b49f9b6a342b78fb4d5a02ff358a7c5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rwxr-xr-xAndroid.bp2
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index cecc70f..e010bf1 100755
--- a/Android.bp
+++ b/Android.bp
@@ -131,6 +131,8 @@ java_library {
sdk_version: "current",
// TODO(b/237039251) use "apex_inherit" when Java modules support it
min_sdk_version: "29",
+ // b/267831518: Pin tradefed and dependencies to Java 11.
+ java_version: "11",
}
// TODO(b/171429704): Remove this genrule and use the fuzz_data.zip