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

Commit ce330e5f authored by Dan Willemsen's avatar Dan Willemsen Committed by Android (Google) Code Review
Browse files

Merge "Warn more clearly when there are duplicate copied headers" into nyc-dev

parents 74c78f95 4fbc164d

core/Makefile

+14 −3
Original line number Diff line number Diff line
@@ -46,6 +46,20 @@ $(foreach cf,$(unique_product_copy_files_pairs), \ 
unique_product_copy_files_pairs :=

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

ifeq (,$(TARGET_BUILD_APPS))
@@ -469,7 +483,6 @@ endif 
# the ramdisk

INTERNAL_RAMDISK_FILES := $(filter $(TARGET_ROOT_OUT)/%, \

	$(ALL_PREBUILT) \

	$(ALL_COPIED_HEADERS) \

	$(ALL_GENERATED_SOURCES) \

	$(ALL_DEFAULT_INSTALLED_MODULES))
@@ -1034,7 +1047,6 @@ PDK_FUSION_SYSIMG_FILES := \ 


INTERNAL_SYSTEMIMAGE_FILES := $(filter $(TARGET_OUT)/%, \

    $(ALL_PREBUILT) \

    $(ALL_COPIED_HEADERS) \

    $(ALL_GENERATED_SOURCES) \

    $(ALL_DEFAULT_INSTALLED_MODULES) \

    $(PDK_FUSION_SYSIMG_FILES) \
@@ -1951,7 +1963,6 @@ ATREE_FILES := 
ifeq ($(strip $(ATREE_FILES)),)

ATREE_FILES := \

	$(ALL_PREBUILT) \

	$(ALL_COPIED_HEADERS) \

	$(ALL_DEFAULT_INSTALLED_MODULES) \

	$(INSTALLED_RAMDISK_TARGET) \

	$(ALL_DOCS) \

core/copy_headers.mk

+4 −2
Original line number Diff line number Diff line
@@ -18,8 +18,10 @@ $(foreach header,$(LOCAL_COPY_HEADERS), \ 
      $(if $(LOCAL_COPY_HEADERS_TO),\

        $($(my_prefix)OUT_HEADERS)/$(LOCAL_COPY_HEADERS_TO)/$(notdir $(header)),\

        $($(my_prefix)OUT_HEADERS)/$(notdir $(header)))) \

  $(eval $(call copy-one-header,$(_chFrom),$(_chTo))) \

  $(eval all_copied_headers: $(_chTo)) \

  $(eval ALL_COPIED_HEADERS.$(_chTo).MAKEFILE += $(LOCAL_MODULE_MAKEFILE)) \

  $(eval ALL_COPIED_HEADERS.$(_chTo).SRC += $(_chFrom)) \

  $(if $(filter $(_chTo),$(ALL_COPIED_HEADERS)),, \

      $(eval ALL_COPIED_HEADERS += $(_chTo))) \

 )

_chFrom :=

_chTo :=