Merge "Pin tradefed dependencies to Java 11" am: f248774ff1android-u-beta-1-gpl

Original change: https://android-review.googlesource.com/c/platform/external/junit/+/2419901

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

1 files changed, 3 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index b62e615..94dfb88 100644
--- a/Android.bp
+++ b/Android.bp
@@ -45,6 +45,9 @@ java_library_static {
     sdk_version: "core_current",
     static_libs: ["hamcrest"],
 
+    // b/267831518: Pin tradefed and dependencies to Java 11.
+    java_version: "11",
+
     errorprone: {
         javacflags: ["-Xep:DoNotCall:OFF"]
     }