diff options
| author | Ying Wang <wangying@google.com> | 2010-09-03 16:22:47 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2010-09-03 16:24:01 -0700 |
| commit | 90ca11a2d3ae2f6b17080a68d0ee91036ab4341a (patch) | |
| tree | 5fcc9aa79dc88c1bcde436803aaa8cee82dad97f | |
| parent | f06675e2a47d0e9322f8a619e84f72882cec039d (diff) | |
| download | build-90ca11a2d3ae2f6b17080a68d0ee91036ab4341a.zip build-90ca11a2d3ae2f6b17080a68d0ee91036ab4341a.tar.gz build-90ca11a2d3ae2f6b17080a68d0ee91036ab4341a.tar.bz2 | |
Fix the unstripped path if LOCAL_MODULE_PATH is set.
Bug: 2953067
Change-Id: I12a0bdb1f3df4fa98bea70f60e0ce26bf863c924
| -rw-r--r-- | core/dynamic_binary.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/dynamic_binary.mk b/core/dynamic_binary.mk index c04deef..0fa7647 100644 --- a/core/dynamic_binary.mk +++ b/core/dynamic_binary.mk @@ -14,7 +14,12 @@ endif LOCAL_UNSTRIPPED_PATH := $(strip $(LOCAL_UNSTRIPPED_PATH)) ifeq ($(LOCAL_UNSTRIPPED_PATH),) - LOCAL_UNSTRIPPED_PATH := $(TARGET_OUT_$(LOCAL_MODULE_CLASS)_UNSTRIPPED) + 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. |