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

am: d186e1db6f

Change-Id: Ia040c655daf9c7649cd5e3732a67e346787786e5
This commit is contained in:
Colin Cross
2017-02-18 06:24:20 +00:00
committed by android-build-merger

View File

@@ -352,7 +352,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