commit 8eac0005c6511bae967cd4fde1612315c49673c9
author Sorin Basca <sorinbasca@google.com> Fri Jul 22 17:24:02 2022 +0100
committer Sorin Basca <sorinbasca@google.com> Thu Sep 29 11:34:52 2022 +0100
tree eece8eaa68e7c4e967b2e4e35b881e453aa32328
parent fba6f7797c02e7cdc7b49b0c8cb5297361cc8630

Use the toolchain from JDK 17

Bug: 233029164
Test: m
Change-Id: I3375bd4e4186c0049490ee3ddc0f85552d25b579

java/config/config.go

diff --git a/java/config/config.go b/java/config/config.go
index ea44aaa..a84c315 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -132,12 +132,7 @@
 		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")