Merge "Build all the way to classes.dex for checkbuild"

am: 41c7d8423b

Change-Id: I11b0cea9ccd40b29e6dc1338a0d29194df1d2579
This commit is contained in:
Colin Cross 2017-02-18 01:38:21 +00:00 committed by android-build-merger
commit 9003bc7d4b
1 changed files with 4 additions and 0 deletions

View File

@ -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