display: Clean up makefiles
Move common includes and shared libraries to
a common location
Change-Id: I0427f0f98b4c039a691be0ef6f3deead2b4bfa02
diff --git a/liboverlay/Android.mk b/liboverlay/Android.mk
index 63d7780..67bb85f 100644
--- a/liboverlay/Android.mk
+++ b/liboverlay/Android.mk
@@ -1,11 +1,13 @@
LOCAL_PATH := $(call my-dir)
+include $(LOCAL_PATH)/../common.mk
include $(CLEAR_VARS)
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
-LOCAL_SHARED_LIBRARIES := liblog
-LOCAL_SHARED_LIBRARIES += libcutils
-LOCAL_SHARED_LIBRARIES += libutils
-LOCAL_SHARED_LIBRARIES += libmemalloc
-LOCAL_C_INCLUDES := hardware/qcom/display/libgralloc
+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) libmemalloc
+LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"overlay\"
+LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
LOCAL_SRC_FILES := \
overlay.cpp \
overlayCtrl.cpp \
@@ -14,7 +16,4 @@
overlayRotator.cpp \
overlayTransitions.cpp
-LOCAL_CFLAGS:= -DLOG_TAG=\"overlay2\"
-LOCAL_MODULE := liboverlay
-LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)