diff options
| author | Ying Wang <wangying@google.com> | 2014-03-16 20:02:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-16 20:02:56 +0000 |
| commit | 1cda15d3234a502ba7332b56a7bbecca228731cf (patch) | |
| tree | 0314767fc8e8ed0da82e11684bf059bba66dbb7c | |
| parent | db24577bbd0ccc60be19791290d367e2efb5583e (diff) | |
| parent | e1889af2d5e41bef623b5cad5c036da1c540cf49 (diff) | |
| download | build-1cda15d3234a502ba7332b56a7bbecca228731cf.zip build-1cda15d3234a502ba7332b56a7bbecca228731cf.tar.gz build-1cda15d3234a502ba7332b56a7bbecca228731cf.tar.bz2 | |
Merge "Don't modify LOCAL_STRIP_MODULE"
| -rw-r--r-- | core/dynamic_binary.mk | 9 |
1 files changed, 5 insertions, 4 deletions
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 @@ $(symbolic_output) : $(symbolic_input) | $(ACP) 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 @@ $(strip_output): $(strip_input) @echo "target Unstripped: $(PRIVATE_MODULE) ($@)" $(copy-file-to-target-with-cp) endif -endif # LOCAL_STRIP_MODULE +endif # my_strip_module $(cleantarget): PRIVATE_CLEAN_FILES += \ |