diff options
| author | Ying Wang <wangying@google.com> | 2013-11-13 17:56:20 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2013-12-18 10:41:01 -0800 |
| commit | f3584968ff5b13c2ae8469475d5d06c91ff97724 (patch) | |
| tree | e1e8686760cde5c4eb435d9c21ccee405eb5557b /core/dynamic_binary.mk | |
| parent | 3fc636c25af0ddcce6ebe6f99a1d7ca83b84f69a (diff) | |
| download | build-f3584968ff5b13c2ae8469475d5d06c91ff97724.zip build-f3584968ff5b13c2ae8469475d5d06c91ff97724.tar.gz build-f3584968ff5b13c2ae8469475d5d06c91ff97724.tar.bz2 | |
Simplify the calculation of LOCAL_UNSTRIPPED_PATH
Also this fixes the LOCAL_UNSTRIPPED_PATH if the module is installed to
the vendor dir via LOCAL_PROPRIETARY_MODULE.
Bug: 11289169
Change-Id: Ib07e5761411210963076487fe0e148c259e1e082
Diffstat (limited to 'core/dynamic_binary.mk')
| -rw-r--r-- | core/dynamic_binary.mk | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/core/dynamic_binary.mk b/core/dynamic_binary.mk index 7778477..34e028f 100644 --- a/core/dynamic_binary.mk +++ b/core/dynamic_binary.mk @@ -12,16 +12,6 @@ ifdef LOCAL_IS_HOST_MODULE $(error This file should not be used to build host binaries. Included by (or near) $(lastword $(filter-out config/%,$(MAKEFILE_LIST)))) endif -LOCAL_UNSTRIPPED_PATH := $(strip $(LOCAL_UNSTRIPPED_PATH)) -ifeq ($(LOCAL_UNSTRIPPED_PATH),) - ifeq ($(LOCAL_MODULE_PATH),) - LOCAL_UNSTRIPPED_PATH := $(TARGET_OUT_$(LOCAL_MODULE_CLASS)_UNSTRIPPED) - else - # We have to figure out the corresponding unstripped path if LOCAL_MODULE_PATH is customized. - LOCAL_UNSTRIPPED_PATH := $(TARGET_OUT_UNSTRIPPED)/$(patsubst $(PRODUCT_OUT)/%,%,$(LOCAL_MODULE_PATH)) - endif -endif - # The name of the target file, without any path prepended. # TODO: This duplicates logic from base_rules.mk because we need to # know its results before base_rules.mk is included. @@ -94,6 +84,9 @@ endif ########################################################### ## Store a copy with symbols for symbolic debugging ########################################################### +ifeq ($(LOCAL_UNSTRIPPED_PATH),) +LOCAL_UNSTRIPPED_PATH := $(TARGET_OUT_UNSTRIPPED)/$(patsubst $(PRODUCT_OUT)/%,%,$(LOCAL_MODULE_PATH)) +endif symbolic_input := $(compress_output) symbolic_output := $(LOCAL_UNSTRIPPED_PATH)/$(LOCAL_INSTALLED_MODULE_STEM) $(symbolic_output) : $(symbolic_input) | $(ACP) |