diff --git a/core/java.mk b/core/java.mk
index 09e5371..7fa1447 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -555,7 +555,7 @@
 
 $(eval $(call copy-one-file,$(full_classes_jarjar_jar),$(full_classes_jar)))
 
-ifeq ($(EXPERIMENTAL_USE_OPENJDK9),true)
+ifdef TARGET_OPENJDK9
 LOCAL_DX_FLAGS := $(filter-out --multi-dex,$(LOCAL_DX_FLAGS)) --multi-dex
 endif