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

Merge "Warn more clearly when there are duplicate copied headers"

Browse Source
This commit is contained in:
Dan Willemsen
2016-02-23 23:46:25 +00:00
committed by Gerrit Code Review
parent de4078449f 6f60f020d7
commit ca4b755563
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/Makefile
View File

@@ -46,6 +46,20 @@ $(foreach cf,$(unique_product_copy_files_pairs), \
unique_product_copy_files_pairs := unique_product_copy_files_pairs :=
unique_product_copy_files_destinations := unique_product_copy_files_destinations :=
# -----------------------------------------------------------------
# Define rules to copy headers defined in copy_headers.mk
# If more than one makefile declared a header, print a warning,
# then copy the last one defined. This matches the previous make
# behavior.
$(foreach dest,$(ALL_COPIED_HEADERS), \
$(eval _srcs := $(ALL_COPIED_HEADERS.$(dest).SRC)) \
$(eval _src := $(word $(words $(_srcs)),$(_srcs))) \
$(if $(call streq,$(_src),$(_srcs)),, \
$(warning Duplicate header copy: $(dest)) \
$(warning Defined in: $(ALL_COPIED_HEADERS.$(dest).MAKEFILE))) \
$(eval $(call copy-one-header,$(_src),$(dest))))
all_copied_headers: $(ALL_COPIED_HEADERS)
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# docs/index.html # docs/index.html
ifeq (,$(TARGET_BUILD_APPS)) ifeq (,$(TARGET_BUILD_APPS))
@@ -468,7 +482,6 @@ endif
# the ramdisk # the ramdisk
INTERNAL_RAMDISK_FILES := $(filter $(TARGET_ROOT_OUT)/%, \ INTERNAL_RAMDISK_FILES := $(filter $(TARGET_ROOT_OUT)/%, \
$(ALL_PREBUILT) \ $(ALL_PREBUILT) \
$(ALL_COPIED_HEADERS) \
$(ALL_GENERATED_SOURCES) \ $(ALL_GENERATED_SOURCES) \
$(ALL_DEFAULT_INSTALLED_MODULES)) $(ALL_DEFAULT_INSTALLED_MODULES))
@@ -1032,7 +1045,6 @@ PDK_FUSION_SYSIMG_FILES := \
INTERNAL_SYSTEMIMAGE_FILES := $(filter $(TARGET_OUT)/%, \ INTERNAL_SYSTEMIMAGE_FILES := $(filter $(TARGET_OUT)/%, \
$(ALL_PREBUILT) \ $(ALL_PREBUILT) \
$(ALL_COPIED_HEADERS) \
$(ALL_GENERATED_SOURCES) \ $(ALL_GENERATED_SOURCES) \
$(ALL_DEFAULT_INSTALLED_MODULES) \ $(ALL_DEFAULT_INSTALLED_MODULES) \
$(PDK_FUSION_SYSIMG_FILES) \ $(PDK_FUSION_SYSIMG_FILES) \
@@ -1949,7 +1961,6 @@ ATREE_FILES :=
ifeq ($(strip $(ATREE_FILES)),) ifeq ($(strip $(ATREE_FILES)),)
ATREE_FILES := \ ATREE_FILES := \
$(ALL_PREBUILT) \ $(ALL_PREBUILT) \
$(ALL_COPIED_HEADERS) \
$(ALL_DEFAULT_INSTALLED_MODULES) \ $(ALL_DEFAULT_INSTALLED_MODULES) \
$(INSTALLED_RAMDISK_TARGET) \ $(INSTALLED_RAMDISK_TARGET) \
$(ALL_DOCS) \ $(ALL_DOCS) \

6
core/copy_headers.mk
View File

@@ -18,8 +18,10 @@ $(foreach header,$(LOCAL_COPY_HEADERS), \
$(if $(LOCAL_COPY_HEADERS_TO),\ $(if $(LOCAL_COPY_HEADERS_TO),\
$($(my_prefix)OUT_HEADERS)/$(LOCAL_COPY_HEADERS_TO)/$(notdir $(header)),\ $($(my_prefix)OUT_HEADERS)/$(LOCAL_COPY_HEADERS_TO)/$(notdir $(header)),\
$($(my_prefix)OUT_HEADERS)/$(notdir $(header)))) \ $($(my_prefix)OUT_HEADERS)/$(notdir $(header)))) \
$(eval $(call copy-one-header,$(_chFrom),$(_chTo))) \ $(eval ALL_COPIED_HEADERS.$(_chTo).MAKEFILE += $(LOCAL_MODULE_MAKEFILE)) \
$(eval all_copied_headers: $(_chTo)) \ $(eval ALL_COPIED_HEADERS.$(_chTo).SRC += $(_chFrom)) \
$(if $(filter $(_chTo),$(ALL_COPIED_HEADERS)),, \
$(eval ALL_COPIED_HEADERS += $(_chTo))) \
) )
_chFrom := _chFrom :=
_chTo := _chTo :=