From 0afa0e42a61dd3d0a6c7e558f51ff5e37727e550 Mon Sep 17 00:00:00 2001
From: Naomi Luis <nluis@codeaurora.org>
Date: Sun, 11 Dec 2011 15:27:51 -0800
Subject: [PATCH] libhwcomposer: Use the HWC private flags from libQcomUI.

Qcom specific private flags have been moved to libQcomUI. Use these
flags flags in the hwcomposer.

Change-Id: I9898dd11a7fff72678fa1f744454fcf310507a63
---
 libhwcomposer/Android.mk     | 1 +
 libhwcomposer/hwcomposer.cpp | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/libhwcomposer/Android.mk b/libhwcomposer/Android.mk
index 099ee2f..72ef88f 100755
--- a/libhwcomposer/Android.mk
+++ b/libhwcomposer/Android.mk
@@ -18,6 +18,7 @@ LOCAL_C_INCLUDES += hardware/qcom/display/libgralloc
 LOCAL_C_INCLUDES += hardware/qcom/display/liboverlay
 LOCAL_C_INCLUDES += hardware/qcom/display/libcopybit
 LOCAL_C_INCLUDES += hardware/qcom/display/libgenlock
+LOCAL_C_INCLUDES += hardware/qcom/display/libqcomui
 LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
 
 LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
diff --git a/libhwcomposer/hwcomposer.cpp b/libhwcomposer/hwcomposer.cpp
index 298dc3c..9d327ea 100755
--- a/libhwcomposer/hwcomposer.cpp
+++ b/libhwcomposer/hwcomposer.cpp
@@ -38,6 +38,7 @@
 #include <ui/android_native_buffer.h>
 #include <gralloc_priv.h>
 #include <genlock.h>
+#include <qcom_ui.h>
 
 /*****************************************************************************/
 #define ALIGN(x, align) (((x) + ((align)-1)) & ~((align)-1))
@@ -59,12 +60,6 @@ enum HWCCompositionType {
     HWC_USE_COPYBIT                // This layer is to be handled by copybit
 };
 
-enum HWCPrivateFlags {
-    HWC_USE_ORIGINAL_RESOLUTION = HWC_FLAGS_PRIVATE_0, // This layer is to be drawn using overlays
-    HWC_DO_NOT_USE_OVERLAY      = HWC_FLAGS_PRIVATE_1, // Do not use overlays to draw this layer
-    HWC_COMP_BYPASS             = HWC_FLAGS_PRIVATE_3, // Layer "might" use or have used bypass
-};
-
 enum HWCLayerType{
     HWC_SINGLE_VIDEO           = 0x1,
     HWC_ORIG_RESOLUTION        = 0x2,