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

am: b95ebd36c5

Change-Id: I05a87440c1d18c9a4fe420a76fc877afd340903e
This commit is contained in:
Tobias Thierer 2017-07-27 10:46:42 +00:00 committed by android-build-merger
commit f932fdbca1
1 changed files with 5 additions and 0 deletions

View File

@ -16,7 +16,12 @@ endif
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))