Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2655e57b authored by Tobias Thierer's avatar Tobias Thierer Committed by Gerrit Code Review
Browse files

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

parents 315761ac 7ef760b8

core/config.mk

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

core/java.mk

+2 −0
Original line number Original line Diff line number Diff line
@@ -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