diff options
| author | Tobias Thierer <tobiast@google.com> | 2017-12-20 22:40:39 +0000 |
|---|---|---|
| committer | Tobias Thierer <tobiast@google.com> | 2017-12-20 23:14:37 +0000 |
| commit | e59aeff5c4afb767d2562ae0fef1e743194f3e36 (patch) | |
| tree | f9ff6827f8e4bb51dbde951c447d9ec0570b1d5c /ui/build | |
| parent | 57603998a68f63fe6fad5d525bb61d68a78e6343 (diff) | |
| download | build_soong-e59aeff5c4afb767d2562ae0fef1e743194f3e36.tar.gz build_soong-e59aeff5c4afb767d2562ae0fef1e743194f3e36.tar.bz2 build_soong-e59aeff5c4afb767d2562ae0fef1e743194f3e36.zip | |
Make ANDROID_JAVA{8,9}_HOME available to config.mk.
Previously, these variables were exported only by makevars.go,
but those values are not available to config.mk. This CL adds
the variable to ui/build/config.go, which also makes it
available to config.mk.
Test: Treehugger
Bug: 70862583
Bug: 70521453
Change-Id: Ib54660e4b08ab751265b30004630cf1bb8c0041b
Diffstat (limited to 'ui/build')
| -rw-r--r-- | ui/build/config.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ui/build/config.go b/ui/build/config.go index df97d803..c9752432 100644 --- a/ui/build/config.go +++ b/ui/build/config.go @@ -146,14 +146,16 @@ func NewConfig(ctx Context, args ...string) Config { } // 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 { 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" { - return filepath.Join("prebuilts/jdk/jdk9", ret.HostPrebuiltTag()) + return java9Home } - return filepath.Join("prebuilts/jdk/jdk8", ret.HostPrebuiltTag()) + return java8Home }() absJavaHome := absPath(ctx, javaHome) @@ -164,6 +166,8 @@ func NewConfig(ctx Context, args ...string) Config { ret.environ.Unset("OVERRIDE_ANDROID_JAVA_HOME") ret.environ.Set("JAVA_HOME", absJavaHome) 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))) return Config{ret} |