Use the toolchain from JDK 17

Bug: 233029164 Test: m Change-Id: I3375bd4e4186c0049490ee3ddc0f85552d25b579
2022-07-22 17:24:02 +01:00
parent fba6f7797c
commit 8eac0005c6
2 changed files with 5 additions and 10 deletions
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -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")