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

Commit 3e87e835 authored by Colin Cross's avatar Colin Cross
Browse files

Give strip depfile a unique name, properly include it 

$(LOCAL_BUILT_MODULE).d may conflict with the .d file for a .o file,
use $(LOCAL_BUILT_MODULE).strip.d.  Also pass the required second
arg to include-depfile.

Bug: 148387048
Test: m checkbuild
Change-Id: I1f5f4c38010294a12d6777439b0f66c0102c1c96
parent f78c9f6e

core/dynamic_binary.mk

+2 −2
Original line number Diff line number Diff line
@@ -132,8 +132,8 @@ ifneq (,$(my_strip_module)) 
	CLANG_BIN=$(LLVM_PREBUILTS_PATH) \

	CROSS_COMPILE=$(PRIVATE_TOOLS_PREFIX) \

	XZ=$(XZ) \

	$(SOONG_STRIP_PATH) -i $< -o $@ -d $@.d $(PRIVATE_STRIP_ARGS)

  $(call include-depfile,$(strip_output).d)

	$(SOONG_STRIP_PATH) -i $< -o $@ -d $@.strip.d $(PRIVATE_STRIP_ARGS)

  $(call include-depfile,$(strip_output).strip.d,$(strip_output))

else

  # Don't strip the binary, just copy it.  We can't skip this step

  # because a copy of the binary must appear at LOCAL_BUILT_MODULE.