13cb165b91
My change to clean up obsolete copy headers would remove valid ones if thhe LOCAL_COPY_HEADERS_TO path wasn't cleaned. I'm seeing this most with values that just end in '/', so we end up with a '//' in the path, which isn't textually equivalent, and we remove it. Test: No longer seeing constant removals on internal products Test: Set LOCAL_COPY_HEADERS_TO := .. Test: Set LOCAL_COPY_HEADERS_TO := ../foo Test: Set LOCAL_COPY_HEADERS_TO := /foo Change-Id: Idbeeb207a2bb2a8da766473dbded877cec7c9cc1
56 lines
2.1 KiB
Makefile
56 lines
2.1 KiB
Makefile
ifneq (,$(strip $(LOCAL_COPY_HEADERS)))
|
|
###########################################################
|
|
## Copy headers to the install tree
|
|
###########################################################
|
|
$(call record-module-type,COPY_HEADERS)
|
|
ifneq ($(strip $(LOCAL_IS_HOST_MODULE)),)
|
|
$(call pretty-error,LOCAL_COPY_HEADERS may not be used with host modules)
|
|
endif
|
|
|
|
# Modules linking against the SDK do not have the include path to use
|
|
# COPY_HEADERS, so prevent them from exporting any either.
|
|
ifdef LOCAL_SDK_VERSION
|
|
$(call pretty-error,Modules using LOCAL_SDK_VERSION may not use LOCAL_COPY_HEADERS)
|
|
endif
|
|
|
|
include $(BUILD_SYSTEM)/local_vndk.mk
|
|
|
|
# If we're using the VNDK, only vendor modules using the VNDK may use
|
|
# LOCAL_COPY_HEADERS. Platform libraries will not have the include path
|
|
# present.
|
|
ifdef BOARD_VNDK_VERSION
|
|
ifndef LOCAL_USE_VNDK
|
|
$(call pretty-error,Only vendor modules using LOCAL_USE_VNDK may use LOCAL_COPY_HEADERS)
|
|
endif
|
|
endif
|
|
|
|
# Clean up LOCAL_COPY_HEADERS_TO, since soong_ui will be comparing cleaned
|
|
# paths to figure out which headers are obsolete and should be removed.
|
|
LOCAL_COPY_HEADERS_TO := $(call clean-path,$(LOCAL_COPY_HEADERS_TO))
|
|
ifneq ($(filter /% .. ../%,$(LOCAL_COPY_HEADERS_TO)),)
|
|
$(call pretty-error,LOCAL_COPY_HEADERS_TO may not start with / or ../ : $(LOCAL_COPY_HEADERS_TO))
|
|
endif
|
|
ifeq ($(LOCAL_COPY_HEADERS_TO),.)
|
|
LOCAL_COPY_HEADERS_TO :=
|
|
endif
|
|
|
|
# Create a rule to copy each header, and make the
|
|
# all_copied_headers phony target depend on each
|
|
# destination header. copy-one-header defines the
|
|
# actual rule.
|
|
#
|
|
$(foreach header,$(LOCAL_COPY_HEADERS), \
|
|
$(eval _chFrom := $(LOCAL_PATH)/$(header)) \
|
|
$(eval _chTo := \
|
|
$(if $(LOCAL_COPY_HEADERS_TO),\
|
|
$(TARGET_OUT_HEADERS)/$(LOCAL_COPY_HEADERS_TO)/$(notdir $(header)),\
|
|
$(TARGET_OUT_HEADERS)/$(notdir $(header)))) \
|
|
$(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 :=
|
|
|
|
endif # LOCAL_COPY_HEADERS
|