Merge "Build all the way to classes.dex for checkbuild" am: 41c7d8423b

am: 9003bc7d4b Change-Id: I2476afff1972e255525c6dd2d32874d2aaae9926
2017-02-18 01:39:51 +00:00
parent d48f9252d5 9003bc7d4b
commit d186e1db6f
1 changed files with 4 additions and 0 deletions
--- 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