Merge "Allow builds with costum toolchains." am: 1d9689b3e7 am: b95ebd36c5 (a6c76c77) · Commits · e / os / android_build

core/combo/javac.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -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))