diff options
Diffstat (limited to 'ui/build/config.go')
| -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()) |