| commit | 41c7d8423b04bb6359416820632e227528829542 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Feb 18 01:35:39 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Sat Feb 18 01:35:40 2017 +0000 |
| tree | 23ca641107e5a053ca89bfb1e377bafdb30fa74a | |
| parent | 9e92c2fd1885117bb081dc35cd5c5c248217d198 [diff] | |
| parent | e1159f5b3919e21f1969e6f819fe832644a297b4 [diff] |
Merge "Build all the way to classes.dex for checkbuild"
diff --git a/core/java.mk b/core/java.mk index c2a4c83..41b3abe 100644 --- a/core/java.mk +++ b/core/java.mk
@@ -348,7 +348,11 @@ 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