Skip to content

Commit

Permalink
Give strip depfile a unique name, properly include it
Browse files Browse the repository at this point in the history
$(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
  • Loading branch information
colincross committed Jan 27, 2020
1 parent f78c9f6 commit 3e87e83
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions core/dynamic_binary.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 3e87e83

Please sign in to comment.