From 7ef760b832222a760d7407e82d4a92b2e6658a1c Mon Sep 17 00:00:00 2001
From: Tobias Thierer <tobiast@google.com>
Date: Fri, 17 Nov 2017 13:02:12 +0000
Subject: [PATCH] Tweak comments for OpenJDK 9 build toolchain logic.

This addresses review comments on the preceding CL
http://r.android.com/539055

Test: Treehugger
Change-Id: Icb0674190db3d638546a0ed49dbcb97d0698e549
---
 core/config.mk | 2 +-
 core/java.mk   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/config.mk b/core/config.mk
index debe9188c0..05fb926689 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -686,7 +686,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)
diff --git a/core/java.mk b/core/java.mk
index 7fa14476f8..9143bc1248 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -555,6 +555,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