Revert "Use the toolchain from JDK 17"

Revert submission 2164342-use-jdk17

Reason for revert: DroidMonitor-triggered revert due to breakage b/250426490

Reverted Changes:
Ib1a24e7ea:Update path for libjli.so
I3375bd4e4:Use the toolchain from JDK 17
I9183e5511:Use the toolchain from JDK 17

Change-Id: I28fc32290dd337b7d44bb98bc52956ee84f01aaa
This commit is contained in:
Ken Sun
2022-10-03 03:12:41 +00:00
parent 8eac0005c6
commit be3a561aac
2 changed files with 10 additions and 5 deletions

View File

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