diff options
| author | Tobias Thierer <tobiast@google.com> | 2017-12-08 21:24:18 +0000 |
|---|---|---|
| committer | Tobias Thierer <tobiast@google.com> | 2017-12-11 14:54:10 +0000 |
| commit | e05f3a5f3f0d48ff2dc011649e5851187712aefc (patch) | |
| tree | 04d3df5d7e365d571c015e0e852bbaba41f2a662 /ui | |
| parent | 13f23a2753f7093a2344db91a04973a3b24b6789 (diff) | |
| download | build_soong-e05f3a5f3f0d48ff2dc011649e5851187712aefc.tar.gz build_soong-e05f3a5f3f0d48ff2dc011649e5851187712aefc.tar.bz2 build_soong-e05f3a5f3f0d48ff2dc011649e5851187712aefc.zip | |
Revert "Build with OpenJDK 9 -target 1.8 by default except for errorprone."
After this revert CL topic, the default toolchain for Android
goes back to being OpenJDK 8.
This revert is being prepared ahead of time in case of
any problems with CL topic:
https://r.android.com/#/q/topic:bug69449021_attempt2
Bug: 69449021
Test: Treehugger
Change-Id: I9ead8d569226bd487baee3c6d5be9ec7033eb56a
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()) |