From: Ying Wang <wangying@google.com>
Date: Tue, 7 Sep 2010 17:26:18 +0000 (-0700)
Subject: Fix the unstripped path if LOCAL_MODULE_PATH is set. DO NOT MERGE
X-Git-Tag: android-x86-4.4-r1~1580^2~143
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=817f07aef008dd3f32fed3603382123917fdec64;p=android-x86%2Fbuild.git

Fix the unstripped path if LOCAL_MODULE_PATH is set. DO NOT MERGE

Cherry-pick from master.

Change-Id: I0a56e3e91efd53ad2671136b6fe00ee675f56230
---

diff --git a/core/dynamic_binary.mk b/core/dynamic_binary.mk
index 0818d871f..cfbe7402e 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.