From: Matthew Xie <mattx@google.com>
Date: Wed, 19 Mar 2014 20:47:12 +0000 (-0700)
Subject: DO NOT MERGE Revert "external/bluetooth/bluedroid: convert LOCAL_MODULE_PATH to LOCAL... 
X-Git-Tag: android-x86-7.1-r1~1507^2~161
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3765b696da37e6a527b94b03291b3c20eb30b460;p=android-x86%2Fsystem-bt.git

DO NOT MERGE Revert "external/bluetooth/bluedroid: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"

This reverts commit 273789bb86ef99f5ce022bb64c601ea4ea6f8bb3.

Change-Id: I29e511a8176979a6bf311206427b94a19f06f284
---

diff --git a/audio_a2dp_hw/Android.mk b/audio_a2dp_hw/Android.mk
index f9fd0a182..db4b7a3f8 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_RELATIVE_PATH := hw
+LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
 
 LOCAL_MODULE_TAGS := optional
 
diff --git a/main/Android.mk b/main/Android.mk
index 5230b328a..0850bf762 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_RELATIVE_PATH := hw
+LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/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