Merge "Allow builds with costum toolchains."

am: 1d9689b3e7

Change-Id: I240c81333172090d3d36a14c3a23d32017d30d5b
This commit is contained in:
Tobias Thierer 2017-07-27 10:43:38 +00:00 committed by android-build-merger
commit b95ebd36c5

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