aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSorin Basca <sorinbasca@google.com>2023-02-09 10:42:04 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-02-09 10:42:04 +0000
commit479eea55c386f5539fec47eeed3c81664f514bbc (patch)
tree6b438c55e285d44a2c6eb4496fd06859b0421011
parente6373ecd59dba8d95f60ed50b7b010572b431465 (diff)
parent182460aaa9771de75f55e03083799319be3709df (diff)
downloadjacoco-479eea55c386f5539fec47eeed3c81664f514bbc.tar.gz
Pin tradefed dependencies to Java 11 am: 2f006da09b am: e435cc0c76 am: 182460aaa9
Original change: https://android-review.googlesource.com/c/platform/external/jacoco/+/2419210 Change-Id: Icea723aec9c0aa3641d0f5bf3a4d74aeed28c997 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp6
1 files changed, 6 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index d7d6e33c..89e024a8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -173,6 +173,9 @@ java_library_host {
"args4j-2.0.28",
],
+ // b/267831518: Pin tradefed and dependencies to Java 11.
+ java_version: "11",
+
errorprone: {
javacflags: [
"-Xep:EqualsHashCode:WARN",
@@ -188,6 +191,9 @@ java_library_host {
"org.jacoco.report/src/**/*.java",
],
+ // b/267831518: Pin tradefed and dependencies to Java 11.
+ java_version: "11",
+
java_resource_dirs: [
"org.jacoco.report/src",
],