diff options
| author | Tobias Thierer <tobiast@google.com> | 2017-12-06 11:05:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-12-06 11:05:31 +0000 |
| commit | cf8d83de82949dfe69b061d35a048364191ac245 (patch) | |
| tree | b933c511d747411f46cb86c41ced213ad08fff6a /ui | |
| parent | 6b4a32d7712726a21ef153c964fee1f3c508ac30 (diff) | |
| parent | 0ae8b548af38c8b8fccea7cdef11d54740d3bb6a (diff) | |
| download | build_soong-cf8d83de82949dfe69b061d35a048364191ac245.tar.gz build_soong-cf8d83de82949dfe69b061d35a048364191ac245.tar.bz2 build_soong-cf8d83de82949dfe69b061d35a048364191ac245.zip | |
Merge "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, 10 insertions, 1 deletions
diff --git a/ui/build/config.go b/ui/build/config.go index df97d803..b608d386 100644 --- a/ui/build/config.go +++ b/ui/build/config.go @@ -150,7 +150,16 @@ 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 != "" && v != "false" { + 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" { return filepath.Join("prebuilts/jdk/jdk9", ret.HostPrebuiltTag()) } return filepath.Join("prebuilts/jdk/jdk8", ret.HostPrebuiltTag()) |