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

am: 2655e57bbb Change-Id: I13b9520e95365dc2669d7a0c4832a322b7efca84
2017-11-17 18:25:32 +00:00
parent dafe61c817 2655e57bbb
commit ea43e16f60
2 changed files with 3 additions and 1 deletions
--- a/core/java.mk
+++ b/core/java.mk
@@ -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