From: Colin Cross <ccross@android.com>
Date: Sat, 25 Jan 2014 05:00:32 +0000 (-0800)
Subject: external/bluetooth/bluedroid: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
X-Git-Tag: android-x86-7.1-r1~1261^2~111^2~24^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=273789bb86ef99f5ce022bb64c601ea4ea6f8bb3;p=android-x86%2Fsystem-bt.git

external/bluetooth/bluedroid: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH

LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it
with LOCAL_MODULE_RELATIVE_PATH.

Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
---

diff --git a/audio_a2dp_hw/Android.mk b/audio_a2dp_hw/Android.mk
index b5ca08ae7..ee113b14f 100644
--- a/audio_a2dp_hw/Android.mk
+++ b/audio_a2dp_hw/Android.mk
@@ -14,7 +14,7 @@ LOCAL_SHARED_LIBRARIES += \
 	libpower
 
 LOCAL_MODULE := audio.a2dp.default
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_MODULE_RELATIVE_PATH := hw
 
 LOCAL_MODULE_TAGS := optional
 
diff --git a/main/Android.mk b/main/Android.mk
index 0850bf762..5230b328a 100644
--- a/main/Android.mk
+++ b/main/Android.mk
@@ -129,7 +129,7 @@ LOCAL_SHARED_LIBRARIES := \
 LOCAL_STATIC_LIBRARIES := libbt-brcm_gki libbt-brcm_bta libbt-brcm_stack libtinyxml2
 
 LOCAL_MODULE := bluetooth.default
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_REQUIRED_MODULES := libbt-hci libbt-vendor bt_stack.conf bt_did.conf auto_pair_devlist.conf