StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Build with OpenJDK 9 -target 1.8 by default except for errorprone."" am: 8b6faf6c8e

Browse Source 
am: 2491fea5fb

Change-Id: I4aec77adc75bb737ca6d3517a7603b10fa44324f
This commit is contained in:
Tobias Thierer
2017-12-11 23:11:52 +00:00
committed by android-build-merger
parent 2e3afe2295 2491fea5fb
commit 1a72258952
2 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
android/config.go
View File

@@ -295,10 +295,7 @@ func NewConfig(srcDir, buildDir string) (Config, error) {
func (c *config) fromEnv() error { func (c *config) fromEnv() error {
switch c.Getenv("EXPERIMENTAL_USE_OPENJDK9") { switch c.Getenv("EXPERIMENTAL_USE_OPENJDK9") {
case "": case "":
if c.Getenv("RUN_ERROR_PRONE") != "true" { // Use OpenJDK8
// Use OpenJDK9, but target 1.8
c.useOpenJDK9 = true
}
case "false": case "false":
// Use OpenJDK8 // Use OpenJDK8
case "1.8": case "1.8":
@@ -309,7 +306,7 @@ func (c *config) fromEnv() error {
c.useOpenJDK9 = true c.useOpenJDK9 = true
c.targetOpenJDK9 = true c.targetOpenJDK9 = true
default: default:
return fmt.Errorf(`Invalid value for EXPERIMENTAL_USE_OPENJDK9, should be "", "false", "1.8", or "true"`) return fmt.Errorf(`Invalid value for EXPERIMENTAL_USE_OPENJDK9, should be "", "1.8", or "true"`)
} }
return nil return nil

11
ui/build/config.go
View File

@@ -150,16 +150,7 @@ func NewConfig(ctx Context, args ...string) Config {
if override, ok := ret.environ.Get("OVERRIDE_ANDROID_JAVA_HOME"); ok { if override, ok := ret.environ.Get("OVERRIDE_ANDROID_JAVA_HOME"); ok {
return override return override
} }
v, ok := ret.environ.Get("EXPERIMENTAL_USE_OPENJDK9") if v, ok := ret.environ.Get("EXPERIMENTAL_USE_OPENJDK9"); ok && v != "" && v != "false" {
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/jdk9", ret.HostPrebuiltTag())
} }
return filepath.Join("prebuilts/jdk/jdk8", ret.HostPrebuiltTag()) return filepath.Join("prebuilts/jdk/jdk8", ret.HostPrebuiltTag())