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

Merge "Tweak comments for OpenJDK 9 build toolchain logic."

This commit is contained in:
Tobias Thierer 2017-11-17 18:20:39 +00:00 committed by Gerrit Code Review
parent 315761ace1 7ef760b832
commit 2655e57bbb
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/config.mk
View File

@ -686,7 +686,7 @@ HOST_JDK_TOOLS_JAR :=
# http://b/38418220 # http://b/38418220
ifndef USE_OPENJDK9 ifndef USE_OPENJDK9
HOST_JDK_TOOLS_JAR := $(ANDROID_JAVA_TOOLCHAIN)/../lib/tools.jar HOST_JDK_TOOLS_JAR := $(ANDROID_JAVA_TOOLCHAIN)/../lib/tools.jar
endif # ifdef USE_OPENJDK9 endif # ifndef USE_OPENJDK9
# It's called md5 on Mac OS and md5sum on Linux # It's called md5 on Mac OS and md5sum on Linux
ifeq ($(HOST_OS),darwin) ifeq ($(HOST_OS),darwin)

2
core/java.mk
View File

@ -555,6 +555,8 @@ endif
$(eval $(call copy-one-file,$(full_classes_jarjar_jar),$(full_classes_jar))) $(eval $(call copy-one-file,$(full_classes_jarjar_jar),$(full_classes_jar)))
# Temporarily enable --multi-dex until proguard supports v53 class files
# ( http://b/67673860 ) or we move away from proguard altogether.
ifdef TARGET_OPENJDK9 ifdef TARGET_OPENJDK9
LOCAL_DX_FLAGS := $(filter-out --multi-dex,$(LOCAL_DX_FLAGS)) --multi-dex LOCAL_DX_FLAGS := $(filter-out --multi-dex,$(LOCAL_DX_FLAGS)) --multi-dex
endif endif