From 3557abaae2e43428da7559e0a12fb6bd325fab37 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 24 Jan 2014 21:00:32 -0800 Subject: hardware/libhardware: 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 --- modules/audio/Android.mk | 4 ++-- modules/audio_remote_submix/Android.mk | 2 +- modules/camera/Android.mk | 2 +- modules/consumerir/Android.mk | 2 +- modules/gralloc/Android.mk | 2 +- modules/hwcomposer/Android.mk | 2 +- modules/local_time/Android.mk | 2 +- modules/nfc-nci/Android.mk | 2 +- modules/nfc/Android.mk | 2 +- modules/power/Android.mk | 2 +- modules/usbaudio/Android.mk | 2 +- modules/vibrator/Android.mk | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) (limited to 'modules') diff --git a/modules/audio/Android.mk b/modules/audio/Android.mk index f773079..49ed312 100644 --- a/modules/audio/Android.mk +++ b/modules/audio/Android.mk @@ -23,7 +23,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := audio.primary.default -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw +LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SRC_FILES := audio_hw.c LOCAL_SHARED_LIBRARIES := liblog libcutils LOCAL_MODULE_TAGS := optional @@ -35,7 +35,7 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := audio_policy.stub -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw +LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SRC_FILES := audio_policy.c LOCAL_SHARED_LIBRARIES := liblog libcutils LOCAL_MODULE_TAGS := optional diff --git a/modules/audio_remote_submix/Android.mk b/modules/audio_remote_submix/Android.mk index 5f54902..50c8cb2 100644 --- a/modules/audio_remote_submix/Android.mk +++ b/modules/audio_remote_submix/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := audio.r_submix.default -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw +LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SRC_FILES := \ audio_hw.cpp LOCAL_C_INCLUDES += \ diff --git a/modules/camera/Android.mk b/modules/camera/Android.mk index e02a143..fbe44c5 100644 --- a/modules/camera/Android.mk +++ b/modules/camera/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := camera.default -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw +LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_C_INCLUDES += \ system/core/include \ diff --git a/modules/consumerir/Android.mk b/modules/consumerir/Android.mk index ed6aa0f..b881572 100644 --- a/modules/consumerir/Android.mk +++ b/modules/consumerir/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := consumerir.default -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw +LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SRC_FILES := consumerir.c LOCAL_SHARED_LIBRARIES := liblog libcutils LOCAL_MODULE_TAGS := optional diff --git a/modules/gralloc/Android.mk b/modules/gralloc/Android.mk index b24c4cd..e1fd7d4 100644 --- a/modules/gralloc/Android.mk +++ b/modules/gralloc/Android.mk @@ -19,7 +19,7 @@ LOCAL_PATH := $(call my-dir) # hw/..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 := \ diff --git a/modules/hwcomposer/Android.mk b/modules/hwcomposer/Android.mk index f1e819b..35c0fae 100644 --- a/modules/hwcomposer/Android.mk +++ b/modules/hwcomposer/Android.mk @@ -19,7 +19,7 @@ LOCAL_PATH := $(call my-dir) # hw/..so include $(CLEAR_VARS) -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw +LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SHARED_LIBRARIES := liblog libEGL LOCAL_SRC_FILES := hwcomposer.cpp LOCAL_MODULE := hwcomposer.default diff --git a/modules/local_time/Android.mk b/modules/local_time/Android.mk index f840dc7..91885aa 100644 --- a/modules/local_time/Android.mk +++ b/modules/local_time/Android.mk @@ -26,7 +26,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := local_time.default -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw +LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SRC_FILES := local_time_hw.c LOCAL_SHARED_LIBRARIES := liblog libcutils LOCAL_MODULE_TAGS := optional diff --git a/modules/nfc-nci/Android.mk b/modules/nfc-nci/Android.mk index 97262ef..c1f679a 100644 --- a/modules/nfc-nci/Android.mk +++ b/modules/nfc-nci/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := nfc_nci.default -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw +LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SRC_FILES := nfc_nci_example.c LOCAL_SHARED_LIBRARIES := liblog libcutils LOCAL_MODULE_TAGS := optional diff --git a/modules/nfc/Android.mk b/modules/nfc/Android.mk index 429fb43..29b239c 100644 --- a/modules/nfc/Android.mk +++ b/modules/nfc/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := nfc.default -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw +LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SRC_FILES := nfc_pn544_example.c LOCAL_SHARED_LIBRARIES := liblog libcutils LOCAL_MODULE_TAGS := optional diff --git a/modules/power/Android.mk b/modules/power/Android.mk index 50ab221..c868ded 100644 --- a/modules/power/Android.mk +++ b/modules/power/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := power.default -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw +LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SRC_FILES := power.c LOCAL_SHARED_LIBRARIES := liblog LOCAL_MODULE_TAGS := optional diff --git a/modules/usbaudio/Android.mk b/modules/usbaudio/Android.mk index 6b5e66d..199eb09 100644 --- a/modules/usbaudio/Android.mk +++ b/modules/usbaudio/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := audio.usb.default -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw +LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SRC_FILES := \ audio_hw.c LOCAL_C_INCLUDES += \ diff --git a/modules/vibrator/Android.mk b/modules/vibrator/Android.mk index bbba114..b6b480c 100644 --- a/modules/vibrator/Android.mk +++ b/modules/vibrator/Android.mk @@ -20,7 +20,7 @@ LOCAL_MODULE := vibrator.default # HAL module implementation stored in # hw/.default.so -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw +LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_C_INCLUDES := hardware/libhardware LOCAL_SRC_FILES := vibrator.c LOCAL_SHARED_LIBRARIES := liblog -- cgit v1.1