Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1610f85 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Mark more targets as PHONY" am: 6708f950

am: 76f0441d

Change-Id: Ifaa83677dbcf6684553b25530cca058026584ab0
parents ab138908 76f0441d
Loading
Loading
Loading
Loading
+1 −0
Original line number Original line Diff line number Diff line
@@ -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) \
+1 −0
Original line number Original line Diff line number Diff line
@@ -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))


+1 −0
Original line number Original line Diff line number Diff line
@@ -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) \
+2 −0
Original line number Original line Diff line number Diff line
@@ -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) \
@@ -566,6 +567,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: $@
+2 −1
Original line number Original line Diff line number Diff line
@@ -1365,7 +1365,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
Loading