commit e1889af2d5e41bef623b5cad5c036da1c540cf49
author Ying Wang <wangying@google.com> Sun Mar 16 12:43:49 2014 -0700
committer Ying Wang <wangying@google.com> Sun Mar 16 12:43:49 2014 -0700
tree 0eef0671fd73fb480f3fc4fde5ce5fb9f440a121
parent 933e8940d00745413ae1e9d0e76714feecf9086a

Don't modify LOCAL_STRIP_MODULE

LOCAL_STRIP_MODULE will be reused in multilib build.

Change-Id: I3512efb360c7eaafad02859723ab4368778effed

core/dynamic_binary.mk

diff --git a/core/dynamic_binary.mk b/core/dynamic_binary.mk
index 6d3d2b5..1d3b99e 100644
--- a/core/dynamic_binary.mk
+++ b/core/dynamic_binary.mk
@@ -104,11 +104,12 @@
 strip_input := $(symbolic_output)
 strip_output := $(LOCAL_BUILT_MODULE)
 
-ifeq ($(strip $(LOCAL_STRIP_MODULE)),)
-  LOCAL_STRIP_MODULE := $(strip $(TARGET_STRIP_MODULE))
+my_strip_module := $(LOCAL_STRIP_MODULE)
+ifeq ($(my_strip_module),)
+  my_strip_module := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_STRIP_MODULE)
 endif
 
-ifeq ($(LOCAL_STRIP_MODULE),true)
+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)
@@ -129,7 +130,7 @@
 	@echo "target Unstripped: $(PRIVATE_MODULE) ($@)"
 	$(copy-file-to-target-with-cp)
 endif
-endif # LOCAL_STRIP_MODULE
+endif # my_strip_module
 
 
 $(cleantarget): PRIVATE_CLEAN_FILES += \