diff options
| author | Tobias Thierer <tobiast@google.com> | 2017-12-11 22:57:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-12-11 22:57:51 +0000 |
| commit | 8b6faf6c8e5f591c21bafdab78e90d4a1a07b5ee (patch) | |
| tree | 4c5d4a750378c1aae8147efaade4240c0b0d9180 /ui | |
| parent | 592faab77ddbc1fc524c27ee1272527c30e4c8a8 (diff) | |
| parent | e05f3a5f3f0d48ff2dc011649e5851187712aefc (diff) | |
| download | build_soong-8b6faf6c8e5f591c21bafdab78e90d4a1a07b5ee.tar.gz build_soong-8b6faf6c8e5f591c21bafdab78e90d4a1a07b5ee.tar.bz2 build_soong-8b6faf6c8e5f591c21bafdab78e90d4a1a07b5ee.zip | |
Merge "Revert "Build with OpenJDK 9 -target 1.8 by default except for errorprone.""
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/build/config.go | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/ui/build/config.go b/ui/build/config.go index b608d386..df97d803 100644 --- a/ui/build/config.go +++ b/ui/build/config.go @@ -150,16 +150,7 @@ func NewConfig(ctx Context, args ...string) Config { if override, ok := ret.environ.Get("OVERRIDE_ANDROID_JAVA_HOME"); ok { return override } - v, ok := ret.environ.Get("EXPERIMENTAL_USE_OPENJDK9") - if !ok { - v2, ok2 := ret.environ.Get("RUN_ERROR_PRONE") - if ok2 && (v2 == "true") { - v = "false" - } else { - v = "1.8" - } - } - if v != "false" { + 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()) |