diff options
| author | 2024-03-11 17:23:06 +0000 | |
|---|---|---|
| committer | 2024-03-11 17:23:06 +0000 | |
| commit | 5dfa238f224b816753baebdaad36cb06add12073 (patch) | |
| tree | 889b71b3f7bafaa13859c5084cdd66385640c3e3 /java | |
| parent | b832ae19d84132ffe8d780009e772f6602d6b027 (diff) | |
Revert^2 "Switch to JDK 21"
This reverts commit b832ae19d84132ffe8d780009e772f6602d6b027.
Reason for revert: Reland Switch to JDK 21 when related issues are resolved.
Bug: 313924276
Change-Id: Ibb5031d9892d1ddc5bc4d2af9885c3192b8ac8ad
Test: TH
Diffstat (limited to 'java')
| -rw-r--r-- | java/config/config.go | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/java/config/config.go b/java/config/config.go index 6a945ac9c..d720046a1 100644 --- a/java/config/config.go +++ b/java/config/config.go @@ -131,12 +131,7 @@ func init() { if override := ctx.Config().Getenv("OVERRIDE_JLINK_VERSION_NUMBER"); override != "" { return override } - switch ctx.Config().Getenv("EXPERIMENTAL_USE_OPENJDK21_TOOLCHAIN") { - case "true": - return "21" - default: - return "17" - } + return "21" }) pctx.SourcePathVariable("JavaToolchain", "${JavaHome}/bin") |