commit | 6765130bc59129061ccbe802109c29d3256e2908 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Nov 08 19:06:51 2024 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Nov 08 19:06:51 2024 +0000 |
tree | b1829b14245e411a6fd6cb1ab0f21f996411b184 | |
parent | 31432ecfca2cf0d273dea5ea415276a05a60a284 [diff] | |
parent | 323e6f2e3bd7186c8b52c77ef495ea43ce427f7b [diff] |
Merge "Target Java 21 wherever Java 17 was being targeted" into main
diff --git a/java/sdk.go b/java/sdk.go index 036521c..bb2aa8d 100644 --- a/java/sdk.go +++ b/java/sdk.go
@@ -65,8 +65,6 @@ return JAVA_VERSION_9 } else if sdk.FinalOrFutureInt() <= 33 { return JAVA_VERSION_11 - } else if sdk.FinalOrFutureInt() <= 35 { - return JAVA_VERSION_17 } else if ctx.Config().TargetsJava21() { // Build flag that controls whether Java 21 is used as the // default target version, or Java 17.