diff options
author | Ajay Dudani <adudani@codeaurora.org> | 2014-05-10 15:44:59 -0700 |
---|---|---|
committer | Ajay Dudani <adudani@codeaurora.org> | 2014-05-14 16:30:45 -0700 |
commit | 96719e7d570291b6ca40dcf187850ebf443971cf (patch) | |
tree | 3b1592929e2939bd0f40c3bcee1133f97862f8ac | |
parent | 9c0fe9145565c41dd749c12f131606c71626474f (diff) | |
download | display-96719e7d570291b6ca40dcf187850ebf443971cf.tar.gz |
display: Change LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
To comply with multi-arch build system changes for 64-bit support,
LOCAL_MODULE_RELATIVE_PATH needs to be used.
Drop explicit use of LOCAL_MODULE_PATH as its not needed, and
causes build system to overwrite one of multi-arch library
variants with the other arch variant.
Change-Id: I882de72ad2003f1e2bcc93fb63bad7377a84d31d
-rw-r--r-- | libcopybit/Android.mk | 2 | ||||
-rw-r--r-- | libexternal/Android.mk | 1 | ||||
-rw-r--r-- | libgralloc/Android.mk | 2 | ||||
-rw-r--r-- | libhwcomposer/Android.mk | 2 | ||||
-rw-r--r-- | liblight/Android.mk | 2 | ||||
-rw-r--r-- | libmemtrack/Android.mk | 2 | ||||
-rw-r--r-- | liboverlay/Android.mk | 1 | ||||
-rw-r--r-- | libqdutils/Android.mk | 1 | ||||
-rw-r--r-- | libqservice/Android.mk | 1 | ||||
-rw-r--r-- | libvirtual/Android.mk | 1 |
10 files changed, 5 insertions, 10 deletions
diff --git a/libcopybit/Android.mk b/libcopybit/Android.mk index b3d42499..2bfb3967 100644 --- a/libcopybit/Android.mk +++ b/libcopybit/Android.mk @@ -22,7 +22,7 @@ LOCAL_COPY_HEADERS := copybit.h copybit_priv.h include $(BUILD_COPY_HEADERS) LOCAL_MODULE := copybit.$(TARGET_BOARD_PLATFORM) -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw +LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) LOCAL_SHARED_LIBRARIES := $(common_libs) libdl libmemalloc diff --git a/libexternal/Android.mk b/libexternal/Android.mk index 3df69842..05e42d40 100644 --- a/libexternal/Android.mk +++ b/libexternal/Android.mk @@ -3,7 +3,6 @@ include $(LOCAL_PATH)/../common.mk include $(CLEAR_VARS) LOCAL_MODULE := libexternal -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES) LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) LOCAL_SHARED_LIBRARIES := $(common_libs) liboverlay libqdutils diff --git a/libgralloc/Android.mk b/libgralloc/Android.mk index 18beaf22..412f1bee 100644 --- a/libgralloc/Android.mk +++ b/libgralloc/Android.mk @@ -18,7 +18,7 @@ include $(LOCAL_PATH)/../common.mk include $(CLEAR_VARS) LOCAL_MODULE := gralloc.$(TARGET_BOARD_PLATFORM) -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw +LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) LOCAL_SHARED_LIBRARIES := $(common_libs) libmemalloc libqdMetaData diff --git a/libhwcomposer/Android.mk b/libhwcomposer/Android.mk index 7dadfe45..ef7778b9 100644 --- a/libhwcomposer/Android.mk +++ b/libhwcomposer/Android.mk @@ -3,7 +3,7 @@ include $(LOCAL_PATH)/../common.mk include $(CLEAR_VARS) LOCAL_MODULE := hwcomposer.$(TARGET_BOARD_PLATFORM) -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw +LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) \ $(TOP)/external/skia/include/core \ diff --git a/liblight/Android.mk b/liblight/Android.mk index 40115d5b..977fc55d 100644 --- a/liblight/Android.mk +++ b/liblight/Android.mk @@ -18,7 +18,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES := lights.c -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw +LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SHARED_LIBRARIES := liblog LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdlights\" LOCAL_MODULE := lights.$(TARGET_BOARD_PLATFORM) diff --git a/libmemtrack/Android.mk b/libmemtrack/Android.mk index 306eb07a..2fda0b76 100644 --- a/libmemtrack/Android.mk +++ b/libmemtrack/Android.mk @@ -18,7 +18,7 @@ LOCAL_PATH := $(call my-dir) # 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_C_INCLUDES += hardware/libhardware/include LOCAL_SHARED_LIBRARIES := liblog LOCAL_SRC_FILES := memtrack_msm.c kgsl.c diff --git a/liboverlay/Android.mk b/liboverlay/Android.mk index d8c2ab5e..39fc1a8c 100644 --- a/liboverlay/Android.mk +++ b/liboverlay/Android.mk @@ -3,7 +3,6 @@ include $(LOCAL_PATH)/../common.mk include $(CLEAR_VARS) LOCAL_MODULE := liboverlay -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES) LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) LOCAL_SHARED_LIBRARIES := $(common_libs) libqdutils libmemalloc \ diff --git a/libqdutils/Android.mk b/libqdutils/Android.mk index 2907ccf1..212c8d89 100644 --- a/libqdutils/Android.mk +++ b/libqdutils/Android.mk @@ -21,7 +21,6 @@ include $(CLEAR_VARS) LOCAL_COPY_HEADERS_TO := $(common_header_export_path) LOCAL_COPY_HEADERS := qdMetaData.h -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES) LOCAL_SHARED_LIBRARIES := liblog libcutils LOCAL_C_INCLUDES := $(common_includes) LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) diff --git a/libqservice/Android.mk b/libqservice/Android.mk index 0c6123bf..78b1d775 100644 --- a/libqservice/Android.mk +++ b/libqservice/Android.mk @@ -3,7 +3,6 @@ include $(LOCAL_PATH)/../common.mk include $(CLEAR_VARS) LOCAL_MODULE := libqservice -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES) LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) LOCAL_SHARED_LIBRARIES := $(common_libs) libbinder diff --git a/libvirtual/Android.mk b/libvirtual/Android.mk index beeef255..a41ef33c 100644 --- a/libvirtual/Android.mk +++ b/libvirtual/Android.mk @@ -3,7 +3,6 @@ include $(LOCAL_PATH)/../common.mk include $(CLEAR_VARS) LOCAL_MODULE := libvirtual -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES) LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) LOCAL_SHARED_LIBRARIES := $(common_libs) liboverlay libqdutils |