diff options
| author | Tobias Thierer <tobiast@google.com> | 2017-12-08 18:03:43 +0000 |
|---|---|---|
| committer | Tobias Thierer <tobiast@google.com> | 2017-12-08 18:35:43 +0000 |
| commit | 06ae582000b0556d53f7dbb2f9720f2fb141418f (patch) | |
| tree | 04d3df5d7e365d571c015e0e852bbaba41f2a662 | |
| parent | e304cc45755939cec9b0b62b87f26fa539aaade1 (diff) | |
| download | build_soong-06ae582000b0556d53f7dbb2f9720f2fb141418f.tar.gz build_soong-06ae582000b0556d53f7dbb2f9720f2fb141418f.tar.bz2 build_soong-06ae582000b0556d53f7dbb2f9720f2fb141418f.zip | |
Export makevars ANDROID_JAVA{8,9}_HOME.
These variables are published by config.go for use inside
.mk scripts. They are suitable for rules that need to be
pinned to a particular java/javac version because they do
not (yet) support the other.
Bug: 70286093
Test: Treehugger
Change-Id: Id407fca187fdf6c1947fc9d1ed7cd634fe089384
Merged-In: Id407fca187fdf6c1947fc9d1ed7cd634fe089384
| -rw-r--r-- | java/config/makevars.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/java/config/makevars.go b/java/config/makevars.go index b9009f30..dc9a91b2 100644 --- a/java/config/makevars.go +++ b/java/config/makevars.go @@ -36,6 +36,8 @@ func makeVarsProvider(ctx android.MakeVarsContext) { } ctx.Strict("ANDROID_JAVA_HOME", "${JavaHome}") + ctx.Strict("ANDROID_JAVA8_HOME", "prebuilts/jdk/jdk8/${hostPrebuiltTag}") + ctx.Strict("ANDROID_JAVA9_HOME", "prebuilts/jdk/jdk9/${hostPrebuiltTag}") ctx.Strict("ANDROID_JAVA_TOOLCHAIN", "${JavaToolchain}") ctx.Strict("JAVA", "${JavaCmd}") ctx.Strict("JAVAC", "${JavacCmd}") |