commit 2f7d2f53c189ac84d17a009f9c48b7a667b71e0e
author Ying Wang <wangying@google.com> Thu Feb 13 01:11:36 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Feb 13 01:11:36 2014 +0000
tree be6636e1d54109d88682b2921a810fe77cb3bcc8
parent 05ef53b2aefe1ca91f83fc7b7c8ecc143b4912d4
parent a628c31f3f202215789f170020f7cb5f8c4bb274

am a628c31f: am 08d60ceb: Merge "Use LOCAL_MODULE_RELATIVE_PATH to fix multilib build warning."

* commit 'a628c31f3f202215789f170020f7cb5f8c4bb274':
  Use LOCAL_MODULE_RELATIVE_PATH to fix multilib build warning.

audio/Android.mk

diff --git a/audio/Android.mk b/audio/Android.mk
index 33969c3..96341d2 100644
--- a/audio/Android.mk
+++ b/audio/Android.mk
@@ -17,7 +17,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := audio.primary.manta
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_SRC_FILES := \
 	audio_hw.c
 LOCAL_C_INCLUDES += \
@@ -32,4 +32,3 @@
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)
-

liblights/Android.mk

diff --git a/liblights/Android.mk b/liblights/Android.mk
index 96b5856..0f2afce 100644
--- a/liblights/Android.mk
+++ b/liblights/Android.mk
@@ -19,7 +19,7 @@
 
 LOCAL_SRC_FILES := lights.c
 
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_MODULE_RELATIVE_PATH := hw
 
 LOCAL_SHARED_LIBRARIES := liblog
 

power/Android.mk

diff --git a/power/Android.mk b/power/Android.mk
index 098c4b9..c0808ec 100644
--- a/power/Android.mk
+++ b/power/Android.mk
@@ -19,7 +19,7 @@
 # hw/<POWERS_HARDWARE_MODULE_ID>.<ro.hardware>.so
 include $(CLEAR_VARS)
 
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_SHARED_LIBRARIES := liblog libcutils
 LOCAL_SRC_FILES := power_manta.c
 LOCAL_MODULE := power.manta