commit 96719e7d570291b6ca40dcf187850ebf443971cf
author Ajay Dudani <adudani@codeaurora.org> Sat May 10 15:44:59 2014 -0700
committer Ajay Dudani <adudani@codeaurora.org> Wed May 14 16:30:45 2014 -0700
tree 3b1592929e2939bd0f40c3bcee1133f97862f8ac
parent 9c0fe9145565c41dd749c12f131606c71626474f

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

libhwcomposer/Android.mk

diff --git a/libhwcomposer/Android.mk b/libhwcomposer/Android.mk
index 7dadfe4..ef7778b 100644
--- a/libhwcomposer/Android.mk
+++ b/libhwcomposer/Android.mk
@@ -3,7 +3,7 @@
 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 \