StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make javac checkbuilds match jack" am: cb8077df16 am: 9f1e58aab9

Browse Source 
am: 2e2758b69d

Change-Id: I7d62da41492c2a4aae39d5f29b9b6086be9f58e6
This commit is contained in:
Colin Cross
2017-05-02 23:10:30 +00:00
committed by android-build-merger
parent 81cd9227f3 2e2758b69d
commit 5730186686
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java.mk
View File

@@ -350,11 +350,7 @@ else
LOCAL_CHECKED_MODULE := $(jack_check_timestamp)
endif
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
@@ -667,6 +663,8 @@ $(built_dex): $(built_dex_intermediate)
$(hide) rm -f $(dir $@)/classes*.dex
$(hide) cp -fp $(dir $<)/classes*.dex $(dir $@)
java-dex: $(built_dex)
endif # !LOCAL_IS_STATIC_JAVA_LIBRARY
findbugs_xml := $(intermediates.COMMON)/findbugs.xml