From bf086ed1a674d47c01fd5bcfdf070334652e2e2e Mon Sep 17 00:00:00 2001 From: David Srbecky Date: Fri, 30 Apr 2021 20:01:34 +0100 Subject: [PATCH] Propagate CREATE_MINIDEBUGINFO to strip.sh Bug: 110133331 Test: m Change-Id: I5899ad1c0f6111a48eabe7a104a573787cc688e7 --- core/dynamic_binary.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/dynamic_binary.mk b/core/dynamic_binary.mk index 48072b369..cd99b1938 100644 --- a/core/dynamic_binary.mk +++ b/core/dynamic_binary.mk @@ -127,12 +127,16 @@ endif ifneq (,$(my_strip_module)) $(strip_output): PRIVATE_STRIP_ARGS := $(my_strip_args) $(strip_output): PRIVATE_TOOLS_PREFIX := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)TOOLS_PREFIX) - $(strip_output): $(strip_input) $(SOONG_STRIP_PATH) + $(strip_output): $(strip_input) $(SOONG_STRIP_PATH) $(XZ) @echo "$($(PRIVATE_PREFIX)DISPLAY) Strip: $(PRIVATE_MODULE) ($@)" CLANG_BIN=$(LLVM_PREBUILTS_PATH) \ CROSS_COMPILE=$(PRIVATE_TOOLS_PREFIX) \ XZ=$(XZ) \ + CREATE_MINIDEBUGINFO=${CREATE_MINIDEBUGINFO} \ $(SOONG_STRIP_PATH) -i $< -o $@ -d $@.strip.d $(PRIVATE_STRIP_ARGS) + ifneq ($(HOST_OS),darwin) + $(strip_output): $(CREATE_MINIDEBUGINFO) + endif $(call include-depfile,$(strip_output).strip.d,$(strip_output)) else # Don't strip the binary, just copy it. We can't skip this step