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

libgralloc/Android.mk

diff --git a/libgralloc/Android.mk b/libgralloc/Android.mk
index fd4cacb..ae745f2 100644
--- a/libgralloc/Android.mk
+++ b/libgralloc/Android.mk
@@ -11,48 +11,29 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
+#gralloc module
 LOCAL_PATH := $(call my-dir)
-
-# HAL module implemenation, not prelinked and stored in
-# hw/<OVERLAY_HARDWARE_MODULE_ID>.<ro.product.board>.so
+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 libutils libmemalloc
-LOCAL_SHARED_LIBRARIES += libgenlock libqdutils libGLESv1_CM
-LOCAL_C_INCLUDES       := hardware/qcom/display/liboverlay/
-LOCAL_C_INCLUDES       += hardware/qcom/display/libgenlock
-LOCAL_C_INCLUDES       += hardware/qcom/display/libqdutils
-LOCAL_MODULE           := gralloc.$(TARGET_BOARD_PLATFORM)
-LOCAL_MODULE_TAGS      := optional
-LOCAL_CFLAGS           := -DLOG_TAG=\"$(TARGET_BOARD_PLATFORM).gralloc\" \
-                          -DDEBUG_CALC_FPS -Wno-missing-field-initializers
-LOCAL_SRC_FILES :=  gpu.cpp gralloc.cpp framebuffer.cpp mapper.cpp
 
-ifeq ($(TARGET_USES_POST_PROCESSING),true)
-    LOCAL_CFLAGS     += -DUSES_POST_PROCESSING
-    LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/pp/inc
-endif
-
-ifeq ($(TARGET_USES_MDP3), true)
-    LOCAL_CFLAGS += -DUSE_MDP3
-endif
-
-ifeq ($(TARGET_HAVE_HDMI_OUT),true)
-    LOCAL_CFLAGS += -DHDMI_DUAL_DISPLAY
-    LOCAL_SHARED_LIBRARIES += liboverlay
-endif
+LOCAL_MODULE                  := gralloc.$(TARGET_BOARD_PLATFORM)
+LOCAL_MODULE_PATH             := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_MODULE_TAGS             := optional
+LOCAL_C_INCLUDES              := $(common_includes)
+LOCAL_SHARED_LIBRARIES        := $(common_libs) libmemalloc libgenlock
+LOCAL_SHARED_LIBRARIES        += libqdutils libGLESv1_CM
+LOCAL_CFLAGS                  := $(common_flags) -DLOG_TAG=\"gralloc\"
+LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
+LOCAL_SRC_FILES               :=  gpu.cpp gralloc.cpp framebuffer.cpp mapper.cpp
 include $(BUILD_SHARED_LIBRARY)
 
 #MemAlloc Library
 include $(CLEAR_VARS)
-LOCAL_PRELINK_MODULE := false
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
-LOCAL_C_INCLUDES := hardware/qcom/display/libqdutils
-LOCAL_SHARED_LIBRARIES := liblog libcutils libutils
-LOCAL_SRC_FILES :=  ionalloc.cpp alloc_controller.cpp
-LOCAL_CFLAGS:= -DLOG_TAG=\"memalloc\"
-LOCAL_CFLAGS += -DUSE_ION
-LOCAL_MODULE := libmemalloc
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE           := libmemalloc
+LOCAL_MODULE_TAGS      := optional
+LOCAL_C_INCLUDES       := $(common_includes)
+LOCAL_SHARED_LIBRARIES := $(common_libs) libgenlock
+LOCAL_CFLAGS           := $(common_flags) -DLOG_TAG=\"memalloc\"
+LOCAL_SRC_FILES        :=  ionalloc.cpp alloc_controller.cpp
 include $(BUILD_SHARED_LIBRARY)