Snap for 9679998 from 2f006da09baeb6282cdc6d3e669bbd3ad4914b2c to sdk-releaseplatform-tools-34.0.1

Change-Id: I0af0c5e87bd12d4ae2208bfce167424a524be921

1 files changed, 6 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index d7d6e33c..89e024a8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -173,6 +173,9 @@ java_library_host {
         "args4j-2.0.28",
     ],
 
+    // b/267831518: Pin tradefed and dependencies to Java 11.
+    java_version: "11",
+
     errorprone: {
         javacflags: [
             "-Xep:EqualsHashCode:WARN",
@@ -188,6 +191,9 @@ java_library_host {
         "org.jacoco.report/src/**/*.java",
     ],
 
+    // b/267831518: Pin tradefed and dependencies to Java 11.
+    java_version: "11",
+
     java_resource_dirs: [
         "org.jacoco.report/src",
     ],