Revert "Switch to JDK 21"

This reverts commit 5a2e36b755.

Reason for revert: Preparing revert to have it ready in case of breakages relating to using JDK 21.

Change-Id: I153c4933f6891c7fff43e522a4d128acad6b6d47
This commit is contained in:
Sorin Basca
2024-03-07 21:22:00 +00:00
committed by Gerrit Code Review
parent 5a2e36b755
commit b832ae19d8
2 changed files with 13 additions and 7 deletions

View File

@@ -131,7 +131,12 @@ func init() {
if override := ctx.Config().Getenv("OVERRIDE_JLINK_VERSION_NUMBER"); override != "" {
return override
}
return "21"
switch ctx.Config().Getenv("EXPERIMENTAL_USE_OPENJDK21_TOOLCHAIN") {
case "true":
return "21"
default:
return "17"
}
})
pctx.SourcePathVariable("JavaToolchain", "${JavaHome}/bin")