diff options
| author | Tobias Thierer <tobiast@google.com> | 2017-12-06 14:00:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-12-06 14:00:47 +0000 |
| commit | c7efdd9b36cc6efc41f2b7133d2539ea2fd57dfe (patch) | |
| tree | 55ad862236f276101d1898a4a39909afa0cd7830 /ui | |
| parent | cf8d83de82949dfe69b061d35a048364191ac245 (diff) | |
| parent | 7c05949407f12416caaddd44c8971846a468d97d (diff) | |
| download | build_soong-c7efdd9b36cc6efc41f2b7133d2539ea2fd57dfe.tar.gz build_soong-c7efdd9b36cc6efc41f2b7133d2539ea2fd57dfe.tar.bz2 build_soong-c7efdd9b36cc6efc41f2b7133d2539ea2fd57dfe.zip | |
Merge "Revert "Default to building with OpenJDK 9 -target 1.8.""
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()) |