Merge "Use prebuilts/jdk/jdk9 if EXPERIMENTAL_USE_OPENJDK9 is set" (ed36337b) · Commits · e / os / android_build

core/combo/javac.mk

+10 −5

Original line number	Diff line number	Diff line
		@@ -16,12 +16,17 @@ ifdef TARGET_BUILD_APPS
		endif
		endif

		ifeq ($(OVERRIDE_ANDROID_JAVA_HOME),)
		ANDROID_JAVA_HOME := prebuilts/jdk/jdk8/$(HOST_PREBUILT_TAG)
		else
		ifneq ($(OVERRIDE_ANDROID_JAVA_HOME),)
		# Use this build toolchain instead of the bundled one.
		ANDROID_JAVA_HOME := $(OVERRIDE_ANDROID_JAVA_HOME)
		else # !OVERRIDE_ANDROID_JAVA_HOME
		ifneq ($(EXPERIMENTAL_USE_OPENJDK9),)
		ANDROID_JAVA_HOME := prebuilts/jdk/jdk9/$(HOST_PREBUILT_TAG)
		else
		ANDROID_JAVA_HOME := prebuilts/jdk/jdk8/$(HOST_PREBUILT_TAG)
		endif
		endif

		ANDROID_JAVA_TOOLCHAIN := $(ANDROID_JAVA_HOME)/bin
		export JAVA_HOME := $(abspath $(ANDROID_JAVA_HOME))