Revert^2 "Use the toolchain from JDK 17"

This reverts commit be3a561aac.

Reason for revert: Reland switch to JDK 17
Bug: 233029164
Test: TH

Change-Id: Ifa69e3fd50b853153a9c23756269ff12e72d7e9f
This commit is contained in:
Sorin Basca
2022-10-05 08:20:12 +00:00
parent be3a561aac
commit 7e094b33b7
2 changed files with 5 additions and 10 deletions

View File

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