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

Commit 85ea9541 authored by David Srbecky's avatar David Srbecky Committed by Automerger Merge Worker
Browse files

Merge "Propagate CREATE_MINIDEBUGINFO to strip.sh" am: d18e1422 am:... 

Merge "Propagate CREATE_MINIDEBUGINFO to strip.sh" am: d18e1422 am: 9ad4c921 am: 802c44c3 am: 7568db86

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

Change-Id: I0662221bc5ded2fb24fb5e56b37cfeaf828ec7d9
parents 472eef4e 7568db86

core/dynamic_binary.mk

+5 −1
Original line number Diff line number Diff line
@@ -132,12 +132,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