openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Use prebuilts/jdk/jdk9 if EXPERIMENTAL_USE_OPENJDK9 is set"

This commit is contained in:
Treehugger Robot 2017-10-06 04:34:52 +00:00 committed by Gerrit Code Review
parent 750b8e84c1 d7b99409ce
commit 0c0e2b0779
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/combo/javac.mk
View File

@ -16,12 +16,17 @@ ifdef TARGET_BUILD_APPS
endif endif
endif endif
ifeq ($(OVERRIDE_ANDROID_JAVA_HOME),) ifneq ($(OVERRIDE_ANDROID_JAVA_HOME),)
ANDROID_JAVA_HOME := prebuilts/jdk/jdk8/$(HOST_PREBUILT_TAG) # Use this build toolchain instead of the bundled one.
else ANDROID_JAVA_HOME := $(OVERRIDE_ANDROID_JAVA_HOME)
# Use this build toolchain instead of the bundled one. else # !OVERRIDE_ANDROID_JAVA_HOME
ANDROID_JAVA_HOME := $(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 endif
ANDROID_JAVA_TOOLCHAIN := $(ANDROID_JAVA_HOME)/bin ANDROID_JAVA_TOOLCHAIN := $(ANDROID_JAVA_HOME)/bin
export JAVA_HOME := $(abspath $(ANDROID_JAVA_HOME)) export JAVA_HOME := $(abspath $(ANDROID_JAVA_HOME))