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

Merge "Make ANDROID_JAVA{8,9}_HOME available to config.mk."

Browse Source 
am: 38501a959f

Change-Id: I1d711bec7da9943b8a7d070587669f9353d69a8b
This commit is contained in:
Tobias Thierer
2017-12-21 13:40:51 +00:00
committed by android-build-merger
parent 0fffd6bca4 38501a959f
commit 21421c5faa
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ui/build/config.go
View File

@@ -146,14 +146,16 @@ func NewConfig(ctx Context, args ...string) Config {
} }
// Configure Java-related variables, including adding it to $PATH // Configure Java-related variables, including adding it to $PATH
java8Home := filepath.Join("prebuilts/jdk/jdk8", ret.HostPrebuiltTag())
java9Home := filepath.Join("prebuilts/jdk/jdk9", ret.HostPrebuiltTag())
javaHome := func() string { javaHome := func() string {
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
} }
if v, ok := ret.environ.Get("EXPERIMENTAL_USE_OPENJDK9"); ok && v != "" && v != "false" { if v, ok := ret.environ.Get("EXPERIMENTAL_USE_OPENJDK9"); ok && v != "" && v != "false" {
return filepath.Join("prebuilts/jdk/jdk9", ret.HostPrebuiltTag()) return java9Home
} }
return filepath.Join("prebuilts/jdk/jdk8", ret.HostPrebuiltTag()) return java8Home
}() }()
absJavaHome := absPath(ctx, javaHome) absJavaHome := absPath(ctx, javaHome)
@@ -164,6 +166,8 @@ func NewConfig(ctx Context, args ...string) Config {
ret.environ.Unset("OVERRIDE_ANDROID_JAVA_HOME") ret.environ.Unset("OVERRIDE_ANDROID_JAVA_HOME")
ret.environ.Set("JAVA_HOME", absJavaHome) ret.environ.Set("JAVA_HOME", absJavaHome)
ret.environ.Set("ANDROID_JAVA_HOME", javaHome) ret.environ.Set("ANDROID_JAVA_HOME", javaHome)
ret.environ.Set("ANDROID_JAVA8_HOME", java8Home)
ret.environ.Set("ANDROID_JAVA9_HOME", java9Home)
ret.environ.Set("PATH", strings.Join(newPath, string(filepath.ListSeparator))) ret.environ.Set("PATH", strings.Join(newPath, string(filepath.ListSeparator)))
return Config{ret} return Config{ret}