diff options
author | Sorin Basca <sorinbasca@google.com> | 2023-02-09 10:42:04 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-02-09 10:42:04 +0000 |
commit | 1647dd701f16e1ec4092476406763683dec44960 (patch) | |
tree | 0aaa6c8a4fa87af924826f8641411d0f650730e4 | |
parent | 2617db88dbd6eef8f6a21f2a3d43452ef43994c4 (diff) | |
parent | 9effceaaba37418a57ee73d30f5086f55d7a40c2 (diff) | |
download | junit-1647dd701f16e1ec4092476406763683dec44960.tar.gz |
Merge "Pin tradefed dependencies to Java 11" am: f248774ff1 am: a1a566338b am: 9effceaabaandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-dev
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/2419901
Change-Id: I6f08c336ee23b8c3e5e44bc4c9771060e60d5e36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -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"] } |