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

Merge "Make javac checkbuilds match jack"

Browse Source
This commit is contained in:
Treehugger Robot
2017-05-02 22:56:36 +00:00
committed by Gerrit Code Review
parent c59d10fd1a 9eff830fa2
commit cb8077df16
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

@@ -346,11 +346,7 @@ else
LOCAL_CHECKED_MODULE := $(jack_check_timestamp) LOCAL_CHECKED_MODULE := $(jack_check_timestamp)
endif endif
else else
ifeq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true)
LOCAL_CHECKED_MODULE := $(full_classes_compiled_jar) LOCAL_CHECKED_MODULE := $(full_classes_compiled_jar)
else
LOCAL_CHECKED_MODULE := $(built_dex)
endif
endif endif
endif endif
endif endif
@@ -663,6 +659,8 @@ $(built_dex): $(built_dex_intermediate)
$(hide) rm -f $(dir $@)/classes*.dex $(hide) rm -f $(dir $@)/classes*.dex
$(hide) cp -fp $(dir $<)/classes*.dex $(dir $@) $(hide) cp -fp $(dir $<)/classes*.dex $(dir $@)
java-dex: $(built_dex)
endif # !LOCAL_IS_STATIC_JAVA_LIBRARY endif # !LOCAL_IS_STATIC_JAVA_LIBRARY
findbugs_xml := $(intermediates.COMMON)/findbugs.xml findbugs_xml := $(intermediates.COMMON)/findbugs.xml

2
core/main.mk
View File

@@ -1236,7 +1236,7 @@ $(call dist-for-goals,sdk win_sdk, \
# umbrella targets to assit engineers in verifying builds # umbrella targets to assit engineers in verifying builds
.PHONY: java native target host java-host java-target native-host native-target \ .PHONY: java native target host java-host java-target native-host native-target \
java-host-tests java-target-tests native-host-tests native-target-tests \ java-host-tests java-target-tests native-host-tests native-target-tests \
java-tests native-tests host-tests target-tests tests java-tests native-tests host-tests target-tests tests java-dex
# some synonyms # some synonyms
.PHONY: host-java target-java host-native target-native \ .PHONY: host-java target-java host-native target-native \
target-java-tests target-native-tests target-java-tests target-native-tests