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

Commit 820f42aa authored by Yabin Cui's avatar Yabin Cui Committed by android-build-merger
Browse files

Merge "Use strip mode mini-debug-info by default except on mips." am: e13b4c61 

am: 25b78ede

* commit '25b78ede':
  Use strip mode mini-debug-info by default except on mips.

Change-Id: I8d71d9579112173ad6d0efedc205d1f7077f27d5
parents 40a012a3 25b78ede

core/dynamic_binary.mk

+9 −0
Original line number Original line Diff line number Diff line
@@ -116,8 +116,17 @@ my_strip_module := $(firstword \ 
  $(LOCAL_STRIP_MODULE_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) \

  $(LOCAL_STRIP_MODULE_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) \

  $(LOCAL_STRIP_MODULE))

  $(LOCAL_STRIP_MODULE))

ifeq ($(my_strip_module),)

ifeq ($(my_strip_module),)

  my_strip_module := mini-debug-info

endif



ifeq ($(my_strip_module),mini-debug-info)

# Don't use mini-debug-info on mips (both 32-bit and 64-bit). objcopy checks that all

# SH_MIPS_DWARF sections having name prefix .debug_ or .zdebug_, so there seems no easy

# way using objcopy to remove all debug sections except .debug_frame on mips.

ifneq ($(filter mips mips64,$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)),)

  my_strip_module := true

  my_strip_module := true

endif

endif

endif





$(strip_output): PRIVATE_STRIP := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_STRIP)

$(strip_output): PRIVATE_STRIP := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_STRIP)

$(strip_output): PRIVATE_OBJCOPY := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OBJCOPY)

$(strip_output): PRIVATE_OBJCOPY := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OBJCOPY)