Build all the way to classes.dex for checkbuild

Test: m -j checkbuild
Change-Id: Ie1b7be01c9bbcf1a32399f19d050a93410bdb42b

diff --git a/core/java.mk b/core/java.mk
index 1437ad7..bfa1148 100644 (file)
--- a/core/java.mk
+++ b/core/java.mk
@@ -348,7 +348,11 @@ ifdef full_classes_jar
 ifdef LOCAL_JACK_ENABLED
 LOCAL_CHECKED_MODULE := $(jack_check_timestamp)
 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