From a7cdd156a6717f31439fa05c5968f56585648408 Mon Sep 17 00:00:00 2001 From: Tobias Thierer Date: Wed, 15 Nov 2017 21:16:25 +0000 Subject: [PATCH] Support EXPERIMENTAL_USE_OPENJDK9=false. This fourth possible value currently has the same semantics as a default/unset EXPERIMENTAL_USE_OPENJDK9, but allows people to explicitly switch back to the old semantics when the default changes. Test: make showcommands core-oj (in environments with EXPERIMENTAL_USE_OPENJDK9 set to "", "1.8", and "true"). Bug: 38177295 Change-Id: I25accf14344a05349a6e97572d7c2c1f6a7f2063 --- android/config.go | 2 ++ ui/build/config.go | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/android/config.go b/android/config.go index b73680e6c..79ff32a55 100644 --- a/android/config.go +++ b/android/config.go @@ -291,6 +291,8 @@ func (c *config) fromEnv() error { switch c.Getenv("EXPERIMENTAL_USE_OPENJDK9") { case "": // Use OpenJDK8 + case "false": + // Use OpenJDK8 case "1.8": // Use OpenJDK9, but target 1.8 c.useOpenJDK9 = true diff --git a/ui/build/config.go b/ui/build/config.go index 940bb2fb2..6e5559d06 100644 --- a/ui/build/config.go +++ b/ui/build/config.go @@ -149,7 +149,7 @@ func NewConfig(ctx Context, args ...string) Config { if override, ok := ret.environ.Get("OVERRIDE_ANDROID_JAVA_HOME"); ok { return override } - if v, ok := ret.environ.Get("EXPERIMENTAL_USE_OPENJDK9"); ok && v != "" { + if v, ok := ret.environ.Get("EXPERIMENTAL_USE_OPENJDK9"); ok && v != "" && v != "false" { return filepath.Join("prebuilts/jdk/jdk9", ret.HostPrebuiltTag()) } return filepath.Join("prebuilts/jdk/jdk8", ret.HostPrebuiltTag())