tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
am: 5730186686

Change-Id: Ic50bde66364ef5407f38c0e0ccd7a5278b255513
This commit is contained in:
Colin Cross 2017-05-02 23:12:31 +00:00 committed by android-build-merger
commit 090fe90c06
2 changed files with 3 additions and 5 deletions
Show stats 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

2
core/main.mk
View file

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