diff options
| author | Tobias Thierer <tobiast@google.com> | 2017-11-15 21:16:25 +0000 |
|---|---|---|
| committer | Tobias Thierer <tobiast@google.com> | 2017-11-17 13:14:11 +0000 |
| commit | a7cdd156a6717f31439fa05c5968f56585648408 (patch) | |
| tree | c706d4b7b8137fbdaae3907dfdb005ee21d93483 /ui | |
| parent | ef633e0959fa27241c6601ea8f91875c6a4cc050 (diff) | |
| download | build_soong-a7cdd156a6717f31439fa05c5968f56585648408.tar.gz build_soong-a7cdd156a6717f31439fa05c5968f56585648408.tar.bz2 build_soong-a7cdd156a6717f31439fa05c5968f56585648408.zip | |
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
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/build/config.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/build/config.go b/ui/build/config.go index 940bb2fb..6e5559d0 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()) |