diff --git a/core/java.mk b/core/java.mk
index f64c980d08..5f8e706ce4 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -350,11 +350,7 @@ else
 LOCAL_CHECKED_MODULE := $(jack_check_timestamp)
 endif
 else
-ifeq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true)
 LOCAL_CHECKED_MODULE := $(full_classes_compiled_jar)
-else
-LOCAL_CHECKED_MODULE := $(built_dex)
-endif
 endif
 endif
 endif
@@ -667,6 +663,8 @@ $(built_dex): $(built_dex_intermediate)
 	$(hide) rm -f $(dir $@)/classes*.dex
 	$(hide) cp -fp $(dir $<)/classes*.dex $(dir $@)
 
+java-dex: $(built_dex)
+
 endif # !LOCAL_IS_STATIC_JAVA_LIBRARY
 
 findbugs_xml := $(intermediates.COMMON)/findbugs.xml
diff --git a/core/main.mk b/core/main.mk
index 8c9fe4fb30..163095327b 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1242,7 +1242,7 @@ $(call dist-for-goals,sdk win_sdk, \
 # umbrella targets to assit engineers in verifying builds
 .PHONY: java native target host java-host java-target native-host native-target \
         java-host-tests java-target-tests native-host-tests native-target-tests \
-        java-tests native-tests host-tests target-tests tests
+        java-tests native-tests host-tests target-tests tests java-dex
 # some synonyms
 .PHONY: host-java target-java host-native target-native \
         target-java-tests target-native-tests