tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Tweak comments for OpenJDK 9 build toolchain logic." am: 2655e57bbb am: ea43e16f60

Browse source 
am: c5e4334bb3

Change-Id: I78ef2edd0579ddc3d6ee22e4df929a967e61b86d
This commit is contained in:
Tobias Thierer 2017-11-17 18:29:41 +00:00 committed by android-build-merger
commit ee67994a9b
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

@ -694,7 +694,7 @@ HOST_JDK_TOOLS_JAR :=
# http://b/38418220
ifndef USE_OPENJDK9
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
ifeq ($(HOST_OS),darwin)

2
core/java.mk
View file

@ -568,6 +568,8 @@ endif
$(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
LOCAL_DX_FLAGS := $(filter-out --multi-dex,$(LOCAL_DX_FLAGS)) --multi-dex
endif