From b832ae19d84132ffe8d780009e772f6602d6b027 Mon Sep 17 00:00:00 2001 From: Sorin Basca Date: Thu, 7 Mar 2024 21:22:00 +0000 Subject: [PATCH] Revert "Switch to JDK 21" This reverts commit 5a2e36b7550639a21808f0e55eb9710f1dd53385. Reason for revert: Preparing revert to have it ready in case of breakages relating to using JDK 21. Change-Id: I153c4933f6891c7fff43e522a4d128acad6b6d47 --- java/config/config.go | 7 ++++++- ui/build/config.go | 13 +++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/java/config/config.go b/java/config/config.go index d720046a1..6a945ac9c 100644 --- a/java/config/config.go +++ b/java/config/config.go @@ -131,7 +131,12 @@ func init() { if override := ctx.Config().Getenv("OVERRIDE_JLINK_VERSION_NUMBER"); override != "" { return override } - return "21" + switch ctx.Config().Getenv("EXPERIMENTAL_USE_OPENJDK21_TOOLCHAIN") { + case "true": + return "21" + default: + return "17" + } }) pctx.SourcePathVariable("JavaToolchain", "${JavaHome}/bin") diff --git a/ui/build/config.go b/ui/build/config.go index a380157c6..e29d23929 100644 --- a/ui/build/config.go +++ b/ui/build/config.go @@ -387,21 +387,22 @@ 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 21 toolchain is now the global default.") + ctx.Fatalln("The environment variable EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN is no longer supported. An OpenJDK 11 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 21 toolchain is now the global default.") + ctx.Fatalln("The environment variable EXPERIMENTAL_USE_OPENJDK17_TOOLCHAIN is no longer supported. An OpenJDK 17 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 java21Home + return java17Home }() absJavaHome := absPath(ctx, javaHome)