summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSorin Basca <sorinbasca@google.com>2023-02-09 09:51:45 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-02-09 09:51:45 +0000
commit19b0823fa6bbe6b38a0d3157f08d502475d62021 (patch)
treeb5e310853a7912c1e1c5b23241420414683dd506
parent8d99a89b85694a4512851328e66a89da4e9b41bc (diff)
parent13a64e1c3992293eb368089dc40acec046eda7a1 (diff)
downloadjsr305-19b0823fa6bbe6b38a0d3157f08d502475d62021.tar.gz
Merge "Pin tradefed dependencies to Java 11" am: c9f2168694 am: 13a64e1c39
Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/2419110 Change-Id: I6a6bcfac9903c0d6f8593a6a6b089e4492afb5a2 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