| commit | 1647dd701f16e1ec4092476406763683dec44960 | [log] [tgz] |
|---|---|---|
| author | Sorin Basca <sorinbasca@google.com> | Thu Feb 09 10:42:04 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 09 10:42:04 2023 +0000 |
| tree | 0aaa6c8a4fa87af924826f8641411d0f650730e4 | |
| parent | 2617db88dbd6eef8f6a21f2a3d43452ef43994c4 [diff] | |
| parent | 9effceaaba37418a57ee73d30f5086f55d7a40c2 [diff] |
Merge "Pin tradefed dependencies to Java 11" am: f248774ff1 am: a1a566338b am: 9effceaaba 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>
diff --git a/Android.bp b/Android.bp index b62e615..94dfb88 100644 --- a/Android.bp +++ b/Android.bp
@@ -45,6 +45,9 @@ sdk_version: "core_current", static_libs: ["hamcrest"], + // b/267831518: Pin tradefed and dependencies to Java 11. + java_version: "11", + errorprone: { javacflags: ["-Xep:DoNotCall:OFF"] }