commit f5ed7d7344ee948ca139e01d329917dd5f684d0b
author Tobias Thierer <tobiast@google.com> Thu Jul 27 10:52:04 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 27 10:52:04 2017 +0000
tree 4fc160abeaed6d16bce8ff481cef6ad4ea02d4bf
parent 63683f84e37f27cc63aaf43341d2e5fbe0f6559c
parent a6c76c77cadfe29d721449fb3736e26ddc9c9d7d

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

Change-Id: Ie98311479e1e2243858e20a3c18a3240f931f771

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))