Merge "Revert "Use the toolchain from JDK 17""

2022-10-03 03:17:13 +00:00
parent 1ea00ebb3e be3a561aac
commit 44022c867d
2 changed files with 10 additions and 5 deletions
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -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")