diff options
author | Sorin Basca <sorinbasca@google.com> | 2023-02-09 09:51:45 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-02-09 09:51:45 +0000 |
commit | 9effceaaba37418a57ee73d30f5086f55d7a40c2 (patch) | |
tree | 0aaa6c8a4fa87af924826f8641411d0f650730e4 | |
parent | f4ea7c0a3af70fca84e50e0bf5ecf5fc2cd80cfa (diff) | |
parent | a1a566338b7fdc036758fadaf5957b40cbfa1635 (diff) | |
download | junit-9effceaaba37418a57ee73d30f5086f55d7a40c2.tar.gz |
Merge "Pin tradefed dependencies to Java 11" am: f248774ff1 am: a1a566338b
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/2419901
Change-Id: I8ac7185d34fddedd32070e18cc40eb5d1e2daa73
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"] } |