From 06ae582000b0556d53f7dbb2f9720f2fb141418f Mon Sep 17 00:00:00 2001 From: Tobias Thierer Date: Fri, 8 Dec 2017 18:03:43 +0000 Subject: [PATCH] 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 --- java/config/makevars.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java/config/makevars.go b/java/config/makevars.go index b9009f307..dc9a91b23 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}")