From eae32cda026d4550245b5bd38d77734ae14005be Mon Sep 17 00:00:00 2001
From: toastcfh <toastcfh@gmail.com>
Date: Thu, 22 Dec 2011 21:51:22 -0500
Subject: [PATCH] display: use some cm specific build flags and fix up cflags
 for qcom hardware

Change-Id: I3e39bbb522313d4bafd97cd205411f32a992a697
---
 Android.mk                 | 2 +-
 libgenlock/Android.mk      | 2 +-
 libgralloc/Android.mk      | 4 ++--
 libhwcomposer/Android.mk   | 5 +++--
 libtilerenderer/Android.mk | 1 +
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Android.mk b/Android.mk
index d7111c0..52d3bbd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,7 +1,7 @@
 #Enables the listed display HAL modules
 
 ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
-	display-hals := libhwcomposer liboverlay libgralloc libcopybit
+	display-hals := libhwcomposer liboverlay libgralloc libcopybit libgenlock libtilerenderer
 	display-hals += libqcomui
 	include $(call all-named-subdir-makefiles,$(display-hals))
 endif
diff --git a/libgenlock/Android.mk b/libgenlock/Android.mk
index 2ac565e..09b8a64 100644
--- a/libgenlock/Android.mk
+++ b/libgenlock/Android.mk
@@ -9,7 +9,7 @@ LOCAL_SRC_FILES := genlock.cpp
 LOCAL_CFLAGS:= -DLOG_TAG=\"libgenlock\"
 LOCAL_MODULE_TAGS := optional
 
-ifeq ($(BOARD_USES_GENLOCK),true)
+ifeq ($(TARGET_USES_GENLOCK),true)
 	LOCAL_CFLAGS += -DUSE_GENLOCK
 endif
 
diff --git a/libgralloc/Android.mk b/libgralloc/Android.mk
index 7820499..05dc53f 100755
--- a/libgralloc/Android.mk
+++ b/libgralloc/Android.mk
@@ -36,8 +36,8 @@ ifeq ($(call is-board-platform,msm7x27),true)
     LOCAL_CFLAGS += -DTARGET_MSM7x27
 endif
 
-ifeq ($(TARGET_HAVE_HDMI_OUT),true)
-    LOCAL_CFLAGS += -DHDMI_DUAL_DISPLAY
+ifeq ($(TARGET_QCOM_HDMI_OUT),true)
+    LOCAL_CFLAGS += -DHDMI_DUAL_DISPLAY -DQCOM_HDMI_OUT
     LOCAL_C_INCLUDES += hardware/qcom/display/liboverlay
     LOCAL_SHARED_LIBRARIES += liboverlay
 endif
diff --git a/libhwcomposer/Android.mk b/libhwcomposer/Android.mk
index fd1a761..6b91df9 100755
--- a/libhwcomposer/Android.mk
+++ b/libhwcomposer/Android.mk
@@ -13,6 +13,7 @@ LOCAL_SRC_FILES := 	\
 	
 LOCAL_MODULE := hwcomposer.$(TARGET_BOARD_PLATFORM)
 LOCAL_CFLAGS:= -DLOG_TAG=\"$(TARGET_BOARD_PLATFORM).hwcomposer\"
+LOCAL_CFLAGS += -DQCOM_HARDWARE
 
 LOCAL_C_INCLUDES += hardware/qcom/display/libgralloc
 LOCAL_C_INCLUDES += hardware/qcom/display/liboverlay
@@ -20,8 +21,8 @@ LOCAL_C_INCLUDES += hardware/qcom/display/libcopybit
 LOCAL_C_INCLUDES += hardware/qcom/display/libgenlock
 LOCAL_C_INCLUDES += hardware/qcom/display/libqcomui
 
-ifeq ($(TARGET_HAVE_HDMI_OUT),true)
-LOCAL_CFLAGS += -DHDMI_DUAL_DISPLAY
+ifeq ($(TARGET_QCOM_HDMI_OUT),true)
+LOCAL_CFLAGS += -DHDMI_DUAL_DISPLAY -DQCOM_HDMI_OUT
 endif
 ifeq ($(TARGET_USES_OVERLAY),true)
 LOCAL_CFLAGS += -DUSE_OVERLAY
diff --git a/libtilerenderer/Android.mk b/libtilerenderer/Android.mk
index e0bf342..588b684 100644
--- a/libtilerenderer/Android.mk
+++ b/libtilerenderer/Android.mk
@@ -20,6 +20,7 @@ LOCAL_C_INCLUDES += \
 LOCAL_SRC_FILES := 	\
 	tilerenderer.cpp
 
+LOCAL_CFLAGS += -DUSE_OPENGL_RENDERER -DQCOM_HARDWARE
 LOCAL_MODULE := libtilerenderer
 LOCAL_MODULE_TAGS := optional
 include $(BUILD_SHARED_LIBRARY)