From a2affbbb008cf6c07a1212353cc1ec055ecedc32 Mon Sep 17 00:00:00 2001 From: Pete Gillin Date: Thu, 7 Nov 2019 18:55:53 +0000 Subject: [PATCH 1/2] Add a new option OVERRIDE_JLINK_VERSION_NUMBER. This is a counterpart to the existing OVERRIDE_ANDROID_JAVA_HOME, which is not very useful by itself in a Java module world. All jlink commands will fail if a user sets OVERRIDE_ANDROID_JAVA_HOME without setting OVERRIDE_JLINK_VERSION_NUMBER to the corresponding value (unless they happen to be specifying a different OpenJDK 11 toolchain). Test: OVERRIDE_ANDROID_JAVA_HOME=my-jdk10 OVERRIDE_JLINK_VERSION_NUMBER=10 m core-all-system-modules (with an OpenJDK 10 toolchain symlinked at my-jdk10 just for testing) Test: zcat out/verbose.log.gz | grep 'jmod create' Bug: 131683177 Change-Id: I31542e7f46303bba538d998171a3efe6d0215c7b --- java/config/config.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/java/config/config.go b/java/config/config.go index 1c5596165..a795aad1c 100644 --- a/java/config/config.go +++ b/java/config/config.go @@ -87,6 +87,9 @@ func init() { return ctx.Config().Getenv("ANDROID_JAVA_HOME") }) pctx.VariableFunc("JlinkVersion", func(ctx android.PackageVarContext) string { + if override := ctx.Config().Getenv("OVERRIDE_JLINK_VERSION_NUMBER"); override != "" { + return override + } switch ctx.Config().Getenv("EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN") { case "false": return "9" From a7a3d64a36bd0b6ab0ed4c34f5e4341aa4ebdf70 Mon Sep 17 00:00:00 2001 From: Pete Gillin Date: Thu, 7 Nov 2019 18:58:42 +0000 Subject: [PATCH 2/2] Remove the EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN option. Previously, this setting environment variable to false reverted to an OpenJDK 9 toolchain. This change removes that option. Test: m core-all-system-modules Test: zcat out/verbose.log.gz | grep 'prebuilts/jdk/jdk[0-9]*' Test: EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN=false m core-all-system-modules (fails) Bug: 131683177 Change-Id: I0d679648e1236925ce3ef7e1652379127e846b00 --- java/config/config.go | 7 +------ ui/build/config.go | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/java/config/config.go b/java/config/config.go index a795aad1c..333de32d6 100644 --- a/java/config/config.go +++ b/java/config/config.go @@ -90,12 +90,7 @@ func init() { if override := ctx.Config().Getenv("OVERRIDE_JLINK_VERSION_NUMBER"); override != "" { return override } - switch ctx.Config().Getenv("EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN") { - case "false": - return "9" - default: - return "11" - } + return "11" }) pctx.SourcePathVariable("JavaToolchain", "${JavaHome}/bin") diff --git a/ui/build/config.go b/ui/build/config.go index 686ca3e76..92aee4d8a 100644 --- a/ui/build/config.go +++ b/ui/build/config.go @@ -219,8 +219,8 @@ func NewConfig(ctx Context, args ...string) Config { if override, ok := ret.environ.Get("OVERRIDE_ANDROID_JAVA_HOME"); ok { return override } - if toolchain9, ok := ret.environ.Get("EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN"); ok && toolchain9 == "false" { - return java9Home + 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.") } return java11Home }()