diff options
| author | Tobias Thierer <tobiast@google.com> | 2017-12-05 02:10:34 +0000 |
|---|---|---|
| committer | Tobias Thierer <tobiast@google.com> | 2017-12-05 02:10:55 +0000 |
| commit | 7c05949407f12416caaddd44c8971846a468d97d (patch) | |
| tree | 0047694a146398263efaf491dbbfcfbd7197fc9d /ui/build/config.go | |
| parent | 0ae8b548af38c8b8fccea7cdef11d54740d3bb6a (diff) | |
| download | build_soong-7c05949407f12416caaddd44c8971846a468d97d.tar.gz build_soong-7c05949407f12416caaddd44c8971846a468d97d.tar.bz2 build_soong-7c05949407f12416caaddd44c8971846a468d97d.zip | |
Revert "Default to building with OpenJDK 9 -target 1.8."
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 original change topic,
https://r.android.com/#/q/topic:bug_69449021
Bug: 69449021
Test: Treehugger
This reverts commit 0ae8b548af38c8b8fccea7cdef11d54740d3bb6a.
Change-Id: Ief7646a94f1a264085cd299b4327d244b78a1537
Diffstat (limited to 'ui/build/config.go')
| -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()) |