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

Commit b179ae61 authored by Yo Chiang's avatar Yo Chiang Committed by Automerger Merge Worker
Browse files

Merge "Add phony target to check all PCF ELF prebuilts" am: ad4dae71

Original change: https://android-review.googlesource.com/c/platform/build/+/1311493

Change-Id: I9b97245b1b1a894cd87b396bd0ef4bd1aab46290
parents 52fe30b0 ad4dae71
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -40,6 +40,10 @@ $(if $(filter true,$(BUILD_BROKEN_VINTF_PRODUCT_COPY_FILES)),, \
)
endef

# Phony target to check PRODUCT_COPY_FILES copy pairs don't contain ELF files
.PHONY: check-elf-prebuilt-product-copy-files
check-elf-prebuilt-product-copy-files:

check_elf_prebuilt_product_copy_files := true
ifneq (,$(filter true,$(BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES)))
check_elf_prebuilt_product_copy_files :=
+15 −5
Original line number Diff line number Diff line
@@ -2493,15 +2493,25 @@ endef
# $(2): destination file
# $(3): message to print on error
define copy-non-elf-file-checked
$(2): $(1) $(LLVM_READOBJ)
	@echo "Copy non-ELF: $$@"
$(eval check_non_elf_file_timestamp := \
    $(call intermediates-dir-for,FAKE,check-non-elf-file-timestamps)/$(2).timestamp)
$(check_non_elf_file_timestamp): $(1) $(LLVM_READOBJ)
	@echo "Check non-ELF: $$<"
	$(hide) mkdir -p "$$(dir $$@)"
	$(hide) rm -f "$$@"
	$(hide) \
	    if $(LLVM_READOBJ) -h $$< >/dev/null 2>&1; then \
	        $(call echo-error,$$@,$(3)); \
	        $(call echo-error,$$@,found ELF file: $$<); \
	    if $(LLVM_READOBJ) -h "$$<" >/dev/null 2>&1; then \
	        $(call echo-error,$(2),$(3)); \
	        $(call echo-error,$(2),found ELF file: $$<); \
	        false; \
	    fi
	$(hide) touch "$$@"

$(2): $(1) $(check_non_elf_file_timestamp)
	@echo "Copy non-ELF: $$@"
	$$(copy-file-to-target)

check-elf-prebuilt-product-copy-files: $(check_non_elf_file_timestamp)
endef

# The -t option to acp and the -p option to cp is