commit b95ebd36c53fc12efbdb903e0c8d0b155ec9e2c3
author Tobias Thierer <tobiast@google.com> Thu Jul 27 10:43:38 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 27 10:43:38 2017 +0000
tree 51a3171e893bde657e7b93bff4f8a86abf12f45d
parent 1e00ce0eaad3df28bb91bcd25515761471f266d0
parent 1d9689b3e76a694a8e415c76544ea93943af8274

Merge "Allow builds with costum toolchains."
am: 1d9689b3e7

Change-Id: I240c81333172090d3d36a14c3a23d32017d30d5b

core/combo/javac.mk

diff --git a/core/combo/javac.mk b/core/combo/javac.mk
index 36ac2aa..7d19279 100644
--- a/core/combo/javac.mk
+++ b/core/combo/javac.mk
@@ -16,7 +16,12 @@
 
 common_jdk_flags := -Xmaxerrs 9999999
 
+ifeq ($(OVERRIDE_ANDROID_JAVA_HOME),)
 ANDROID_JAVA_HOME := prebuilts/jdk/jdk8/$(HOST_PREBUILT_TAG)
+else
+# Use this build toolchain instead of the bundled one.
+ANDROID_JAVA_HOME := $(OVERRIDE_ANDROID_JAVA_HOME)
+endif
 ANDROID_JAVA_TOOLCHAIN := $(ANDROID_JAVA_HOME)/bin
 export JAVA_HOME := $(abspath $(ANDROID_JAVA_HOME))