diff options
| author | 2024-03-07 19:36:28 +0000 | |
|---|---|---|
| committer | 2024-03-07 19:36:28 +0000 | |
| commit | 092c3a56fb1f90d295a2d854da0ad1fd8f5a7bb3 (patch) | |
| tree | a3f3e3b12f497a7d68f54d7098e5120ddd18b612 | |
| parent | 5ae58dcabe39fba640663ff4a1e6dcf97b7b024a (diff) | |
| parent | 5a2e36b7550639a21808f0e55eb9710f1dd53385 (diff) | |
Merge "Switch to JDK 21" into main
| -rw-r--r-- | java/config/config.go | 7 | ||||
| -rw-r--r-- | ui/build/config.go | 13 |
2 files changed, 7 insertions, 13 deletions
diff --git a/java/config/config.go b/java/config/config.go index 6a945ac9c..d720046a1 100644 --- a/java/config/config.go +++ b/java/config/config.go @@ -131,12 +131,7 @@ func init() { if override := ctx.Config().Getenv("OVERRIDE_JLINK_VERSION_NUMBER"); override != "" { return override } - switch ctx.Config().Getenv("EXPERIMENTAL_USE_OPENJDK21_TOOLCHAIN") { - case "true": - return "21" - default: - return "17" - } + return "21" }) pctx.SourcePathVariable("JavaToolchain", "${JavaHome}/bin") diff --git a/ui/build/config.go b/ui/build/config.go index 1a2539793..3143b6b0d 100644 --- a/ui/build/config.go +++ b/ui/build/config.go @@ -386,22 +386,21 @@ func NewConfig(ctx Context, args ...string) Config { // Configure Java-related variables, including adding it to $PATH java8Home := filepath.Join("prebuilts/jdk/jdk8", ret.HostPrebuiltTag()) - java17Home := filepath.Join("prebuilts/jdk/jdk17", ret.HostPrebuiltTag()) java21Home := filepath.Join("prebuilts/jdk/jdk21", ret.HostPrebuiltTag()) javaHome := func() string { if override, ok := ret.environ.Get("OVERRIDE_ANDROID_JAVA_HOME"); ok { return override } - if ret.environ.IsEnvTrue("EXPERIMENTAL_USE_OPENJDK21_TOOLCHAIN") { - return java21Home - } if toolchain11, ok := ret.environ.Get("EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN"); ok && toolchain11 != "true" { - ctx.Fatalln("The environment variable EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN is no longer supported. An OpenJDK 11 toolchain is now the global default.") + ctx.Fatalln("The environment variable EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN is no longer supported. An OpenJDK 21 toolchain is now the global default.") } if toolchain17, ok := ret.environ.Get("EXPERIMENTAL_USE_OPENJDK17_TOOLCHAIN"); ok && toolchain17 != "true" { - ctx.Fatalln("The environment variable EXPERIMENTAL_USE_OPENJDK17_TOOLCHAIN is no longer supported. An OpenJDK 17 toolchain is now the global default.") + ctx.Fatalln("The environment variable EXPERIMENTAL_USE_OPENJDK17_TOOLCHAIN is no longer supported. An OpenJDK 21 toolchain is now the global default.") + } + if toolchain21, ok := ret.environ.Get("EXPERIMENTAL_USE_OPENJDK21_TOOLCHAIN"); ok && toolchain21 != "true" { + ctx.Fatalln("The environment variable EXPERIMENTAL_USE_OPENJDK21_TOOLCHAIN is no longer supported. An OpenJDK 21 toolchain is now the global default.") } - return java17Home + return java21Home }() absJavaHome := absPath(ctx, javaHome) |