Merge "Allow builds with costum toolchains." am: 1d9689b3e7
am: b95ebd36c5
am: f932fdbca1
Change-Id: I8823d940509a2fc3710c1ad36ba5140adf92f5ad
This commit is contained in:
commit
a6c76c77ca
|
@ -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))
|
||||
|
||||
|
|
Loading…
Reference in New Issue