summaryrefslogtreecommitdiffstats
path: root/core/dynamic_binary.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-08-20 17:12:32 -0700
committerDan Albert <danalbert@google.com>2015-03-13 11:36:15 -0700
commitc1729f3602fe12f05325bd97d7f74934b5d012db (patch)
tree2dc7fb543b61218451029639756fc875e35ee1f5 /core/dynamic_binary.mk
parent0e2d00ff1f1e3b3bd4e13e70a62c1f8927c3436d (diff)
downloadbuild-c1729f3602fe12f05325bd97d7f74934b5d012db.zip
build-c1729f3602fe12f05325bd97d7f74934b5d012db.tar.gz
build-c1729f3602fe12f05325bd97d7f74934b5d012db.tar.bz2
Strip prebuilt shared library by default.
Strip prebuilt shared library but not try adding gnu debuglink. It would fail if you try run the adding gnu debuglink command if a prebuilt is already stripped. Bug: 17177288 Change-Id: If5811865715c2437e45fbd329983ef1212ef0109 (cherry picked from commit bfb52a2ec199a75e1a0e4e92148af0a6323c9f46)
Diffstat (limited to 'core/dynamic_binary.mk')
-rw-r--r--core/dynamic_binary.mk18
1 files changed, 10 insertions, 8 deletions
diff --git a/core/dynamic_binary.mk b/core/dynamic_binary.mk
index 08fb176..cf06a3d 100644
--- a/core/dynamic_binary.mk
+++ b/core/dynamic_binary.mk
@@ -88,18 +88,21 @@ ifeq ($(my_strip_module),)
my_strip_module := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_STRIP_MODULE)
endif
-ifeq ($(my_strip_module),true)
-# Strip the binary
$(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_READELF := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_READELF)
+ifeq ($(my_strip_module),no_debuglink)
+$(strip_output): PRIVATE_NO_DEBUGLINK := true
+else
+$(strip_output): PRIVATE_NO_DEBUGLINK :=
+endif
+
+ifneq ($(filter true no_debuglink,$(my_strip_module)),)
+# Strip the binary
$(strip_output): $(strip_input) | $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_STRIP)
$(transform-to-stripped)
-else
-ifeq ($(my_strip_module),keep_symbols)
+else ifeq ($(my_strip_module),keep_symbols)
# Strip only the debug frames, but leave the symbol table.
-$(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_READELF := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_READELF)
$(strip_output): $(strip_input) | $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_STRIP)
$(transform-to-stripped-keep-symbols)
@@ -126,7 +129,6 @@ $(strip_output): $(strip_input)
@echo "target Unstripped: $(PRIVATE_MODULE) ($@)"
$(copy-file-to-target-with-cp)
endif
-endif
endif # my_strip_module