aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-02-10 18:08:17 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-02-10 18:08:17 +0000
commit7e0e74ea2491df8b90ad960ea1500328ce71e3f6 (patch)
tree0aaa6c8a4fa87af924826f8641411d0f650730e4
parentd37a93029cfae07208fe1acc01fd117ba3e8d9a5 (diff)
parent6745b658c39d677dd40ccb7355d18e119d1ce297 (diff)
downloadjunit-android14-gsi.tar.gz
Snap for 9586404 from 1647dd701f16e1ec4092476406763683dec44960 to udc-release am: 6745b658c3android14-gsi
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/21360820 Change-Id: Ibf8732d95eeb1314fed7db952386fd8e12f90800 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp3
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"]
}