diff options
author | Colin Cross <ccross@android.com> | 2014-01-28 01:08:45 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-28 01:08:45 +0000 |
commit | 0ab48411fe6498dded9f3fe4cefe82ce629e1972 (patch) | |
tree | 8d5a099b6542c023f7e532294c816987d27c4633 /modules | |
parent | 8690233d7a4f0fe4b588da30a13f2f60528bdb6e (diff) | |
parent | 8ded7780c6658d6db011f642206726234098388f (diff) | |
download | hardware_libhardware-0ab48411fe6498dded9f3fe4cefe82ce629e1972.zip hardware_libhardware-0ab48411fe6498dded9f3fe4cefe82ce629e1972.tar.gz hardware_libhardware-0ab48411fe6498dded9f3fe4cefe82ce629e1972.tar.bz2 |
am 8ded7780: am 3da0d0f4: am 662e97ee: am aea8c156: Merge "hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
* commit '8ded7780c6658d6db011f642206726234098388f':
hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
Diffstat (limited to 'modules')
-rw-r--r-- | modules/audio/Android.mk | 4 | ||||
-rw-r--r-- | modules/audio_remote_submix/Android.mk | 2 | ||||
-rw-r--r-- | modules/camera/Android.mk | 2 | ||||
-rw-r--r-- | modules/consumerir/Android.mk | 2 | ||||
-rw-r--r-- | modules/gralloc/Android.mk | 2 | ||||
-rw-r--r-- | modules/hwcomposer/Android.mk | 2 | ||||
-rw-r--r-- | modules/local_time/Android.mk | 2 | ||||
-rw-r--r-- | modules/nfc-nci/Android.mk | 2 | ||||
-rw-r--r-- | modules/nfc/Android.mk | 2 | ||||
-rw-r--r-- | modules/power/Android.mk | 2 | ||||
-rw-r--r-- | modules/usbaudio/Android.mk | 2 | ||||
-rw-r--r-- | modules/vibrator/Android.mk | 2 |
12 files changed, 13 insertions, 13 deletions
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 02d8a33..ae68ed5 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/<OVERLAY_HARDWARE_MODULE_ID>.<ro.product.board>.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/<OVERLAY_HARDWARE_MODULE_ID>.<ro.product.board>.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/<VIBRATOR_HARDWARE_MODULE_ID>.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 |