commit 73445f3df1a7583fcdac94af06150baf86dea94c
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Mar 08 15:32:06 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Mar 08 15:32:06 2023 +0000
tree 758f0aef9f1294472ac24358629903149ce7c92b
parent 20ab45a7a3fee695d5475a11c70ad1f30a516c3d
parent c3252a88f5b8b16900aec1fb222245aceb68a47b

Snap for 9710098 from c3252a88f5b8b16900aec1fb222245aceb68a47b to mainline-tzdata5-release

Change-Id: Icf5e2add5aaa8b5f536d9095003169fa21fa6fc7

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