summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSorin Basca <sorinbasca@google.com>2023-02-09 10:42:05 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-02-09 10:42:05 +0000
commit9d8c1cf8bc00dad472e4da17ee88bd9484bd0ca3 (patch)
treeb5e310853a7912c1e1c5b23241420414683dd506
parent1b00bff27567a1d93da8622454748514449a3246 (diff)
parent19b0823fa6bbe6b38a0d3157f08d502475d62021 (diff)
downloadjsr305-9d8c1cf8bc00dad472e4da17ee88bd9484bd0ca3.tar.gz
Merge "Pin tradefed dependencies to Java 11" am: c9f2168694 am: 13a64e1c39 am: 19b0823fa6
Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/2419110 Change-Id: I4be3da6bf7c9af2a27795403de69dd477354733e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 541d37c..b5f1920 100644
--- a/Android.bp
+++ b/Android.bp
@@ -53,6 +53,8 @@ java_library_static {
],
min_sdk_version: "14",
srcs: ["ri/src/main/java/**/*.java"],
+ // b/267831518: Pin tradefed and dependencies to Java 11.
+ java_version: "11",
}
// Compatibility name