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

This reverts commit 273789bb86ef99f5ce022bb64c601ea4ea6f8bb3.

Change-Id: I29e511a8176979a6bf311206427b94a19f06f284

diff --git a/audio_a2dp_hw/Android.mk b/audio_a2dp_hw/Android.mk
index f9fd0a1..db4b7a3 100644 (file)
--- 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 5230b32..0850bf7 100644 (file)
--- 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