commit 3d47f2abb24439290d6292005b96a95e672f02d2
author Frank Feng <frankfeng@google.com> Mon Mar 06 21:05:20 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 06 21:05:20 2023 +0000
tree 758f0aef9f1294472ac24358629903149ce7c92b
parent 066570963468cb00950ca8b876b430c99abbeb8c
parent a120b2bad1c8582f94033b313499f2a00446de67

Pin tradefed dependencies to Java 11 am: db47d083ac am: 7e25eafe6c am: 888bd290dc am: a120b2bad1

Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/2472147

Change-Id: I4e9c5243eb28b44e37edebfb2238c787593bfd29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index cecc70f..e010bf1 100755
--- a/Android.bp
+++ b/Android.bp
@@ -131,6 +131,8 @@
     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