commit 4d35af868a667e7792cf54a62ded8df85ece8d03
author Naseer Ahmed <naseer@codeaurora.org> Wed Jul 11 23:43:42 2012 -0700
committer Brian Muramatsu <btmura@google.com> Mon Jul 23 12:29:27 2012 -0700
tree 1965fc65fd87bc94a0b2bcdec9c2396da56154af
parent a87da60090f55b823ee999930b381daa3dbda67e

display: Clean up makefiles

Move common includes and shared libraries to
a common location

Change-Id: I0427f0f98b4c039a691be0ef6f3deead2b4bfa02

libhwcomposer/Android.mk

diff --git a/libhwcomposer/Android.mk b/libhwcomposer/Android.mk
index 018de6c..5499636 100644
--- a/libhwcomposer/Android.mk
+++ b/libhwcomposer/Android.mk
@@ -1,18 +1,14 @@
 LOCAL_PATH := $(call my-dir)
+include $(LOCAL_PATH)/../common.mk
 include $(CLEAR_VARS)
-LOCAL_PRELINK_MODULE := false
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
-LOCAL_SHARED_LIBRARIES := liblog libcutils libhardware libutils
-LOCAL_SHARED_LIBRARIES += libEGL liboverlay libgenlock libqdutils
-LOCAL_SRC_FILES :=  hwc.cpp          \
-                    hwc_overlay.cpp  \
-                    hwc_utils.cpp
-LOCAL_MODULE := hwcomposer.$(TARGET_BOARD_PLATFORM)
-LOCAL_C_INCLUDES := hardware/qcom/display/libgralloc
-LOCAL_C_INCLUDES += hardware/qcom/display/libgenlock
-LOCAL_C_INCLUDES += hardware/qcom/display/liboverlay
-LOCAL_C_INCLUDES += hardware/qcom/display/libqdutils
-LOCAL_CFLAGS:= -DLOG_TAG=\"$(TARGET_BOARD_PLATFORM).hwcomposer\"
+LOCAL_MODULE                  := hwcomposer.$(TARGET_BOARD_PLATFORM)
+LOCAL_MODULE_PATH             := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_MODULE_TAGS             := optional
+LOCAL_C_INCLUDES              := $(common_includes) $(kernel_includes)
+LOCAL_SHARED_LIBRARIES        := $(common_libs) libEGL liboverlay libgenlock \
+                                 libqdutils
+LOCAL_CFLAGS                  := $(common_flags) -DLOG_TAG=\"hwcomposer\"
+LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
+LOCAL_SRC_FILES               :=  hwc.cpp hwc_overlay.cpp hwc_utils.cpp
 
-LOCAL_MODULE_TAGS := optional
 include $(BUILD_SHARED_LIBRARY)