Merge "Mark more targets as PHONY"

This commit is contained in:
Treehugger Robot
2018-07-24 22:24:37 +00:00
committed by Gerrit Code Review
7 changed files with 9 additions and 1 deletions

View File

@@ -356,6 +356,7 @@ endif
## make clean- targets ## make clean- targets
########################################################### ###########################################################
cleantarget := clean-$(my_register_name) cleantarget := clean-$(my_register_name)
.PHONY: $(cleantarget)
$(cleantarget) : PRIVATE_MODULE := $(my_register_name) $(cleantarget) : PRIVATE_MODULE := $(my_register_name)
$(cleantarget) : PRIVATE_CLEAN_FILES := \ $(cleantarget) : PRIVATE_CLEAN_FILES := \
$(LOCAL_BUILT_MODULE) \ $(LOCAL_BUILT_MODULE) \

View File

@@ -287,6 +287,7 @@ $(out_zip): $(full_target)
$(hide) ( F=$$(pwd)/$@ ; cd $(PRIVATE_DOCS_DIR) && zip -rqX $$F * ) $(hide) ( F=$$(pwd)/$@ ; cd $(PRIVATE_DOCS_DIR) && zip -rqX $$F * )
$(LOCAL_MODULE)-docs.zip : $(out_zip) $(LOCAL_MODULE)-docs.zip : $(out_zip)
.PHONY: $(LOCAL_MODULE)-docs.zip
$(call dist-for-goals,docs,$(out_zip)) $(call dist-for-goals,docs,$(out_zip))

View File

@@ -93,6 +93,7 @@ $(full_classes_compiled_jar): \
javac-check : $(full_classes_compiled_jar) javac-check : $(full_classes_compiled_jar)
javac-check-$(LOCAL_MODULE) : $(full_classes_compiled_jar) javac-check-$(LOCAL_MODULE) : $(full_classes_compiled_jar)
.PHONY: javac-check-$(LOCAL_MODULE)
$(full_classes_combined_jar): $(full_classes_compiled_jar) \ $(full_classes_combined_jar): $(full_classes_compiled_jar) \
$(jar_manifest_file) \ $(jar_manifest_file) \

View File

@@ -308,6 +308,7 @@ $(full_classes_compiled_jar): \
javac-check : $(full_classes_compiled_jar) javac-check : $(full_classes_compiled_jar)
javac-check-$(LOCAL_MODULE) : $(full_classes_compiled_jar) javac-check-$(LOCAL_MODULE) : $(full_classes_compiled_jar)
.PHONY: javac-check-$(LOCAL_MODULE)
$(full_classes_combined_jar): PRIVATE_DONT_DELETE_JAR_META_INF := $(LOCAL_DONT_DELETE_JAR_META_INF) $(full_classes_combined_jar): PRIVATE_DONT_DELETE_JAR_META_INF := $(LOCAL_DONT_DELETE_JAR_META_INF)
$(full_classes_combined_jar): $(full_classes_compiled_jar) \ $(full_classes_combined_jar): $(full_classes_compiled_jar) \
@@ -576,6 +577,7 @@ ALL_FINDBUGS_FILES += $(findbugs_xml)
findbugs_html := $(PRODUCT_OUT)/findbugs/$(LOCAL_MODULE).html findbugs_html := $(PRODUCT_OUT)/findbugs/$(LOCAL_MODULE).html
$(findbugs_html) : PRIVATE_XML_FILE := $(findbugs_xml) $(findbugs_html) : PRIVATE_XML_FILE := $(findbugs_xml)
$(LOCAL_MODULE)-findbugs : $(findbugs_html) $(LOCAL_MODULE)-findbugs : $(findbugs_html)
.PHONY: $(LOCAL_MODULE)-findbugs
$(findbugs_html) : $(findbugs_xml) $(findbugs_html) : $(findbugs_xml)
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
@echo ConvertXmlToText: $@ @echo ConvertXmlToText: $@

View File

@@ -1361,7 +1361,8 @@ $(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-dex java-tests native-tests host-tests target-tests tests java-dex \
native-host-cross
# 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

View File

@@ -145,3 +145,4 @@ $(products_svg): $(products_graph) $(product_debug_files)
dot -Tsvg -Nshape=box -o $@ $< dot -Tsvg -Nshape=box -o $@ $<
product-graph: $(products_pdf) $(products_svg) product-graph: $(products_pdf) $(products_svg)
.PHONY: product-graph

View File

@@ -131,6 +131,7 @@ endif # LOCAL_SOONG_DEX_JAR
javac-check : $(full_classes_jar) javac-check : $(full_classes_jar)
javac-check-$(LOCAL_MODULE) : $(full_classes_jar) javac-check-$(LOCAL_MODULE) : $(full_classes_jar)
.PHONY: javac-check-$(LOCAL_MODULE)
ifndef LOCAL_IS_HOST_MODULE ifndef LOCAL_IS_HOST_MODULE
ifeq ($(LOCAL_SDK_VERSION),system_current) ifeq ($(LOCAL_SDK_VERSION),system_current)