commit a87da60090f55b823ee999930b381daa3dbda67e
author Naseer Ahmed <naseer@codeaurora.org> Sun Jul 01 23:54:19 2012 -0700
committer Brian Muramatsu <btmura@google.com> Fri Jul 13 17:50:32 2012 -0700
tree 1a03e47098e19274266ea8e644fb4f94aa1195b3
parent 30621ab602d0ad00d6b50570e0943eae10c64012

display: Add QC Display utils

* Rename qcomui directory to qdutils
* Avoid inclusion of qcom_ui header
* Add class to get MDP version
* Add namespace for qdutils to prevent collison

Change-Id: I9a3f440e6b0fea1cfcc478ddca90af5df3bbb897

libgralloc/Android.mk

diff --git a/libgralloc/Android.mk b/libgralloc/Android.mk
index e3ca6f9..fd4cacb 100644
--- a/libgralloc/Android.mk
+++ b/libgralloc/Android.mk
@@ -19,10 +19,10 @@
 LOCAL_PRELINK_MODULE   := false
 LOCAL_MODULE_PATH      := $(TARGET_OUT_SHARED_LIBRARIES)/hw
 LOCAL_SHARED_LIBRARIES := liblog libcutils libutils libmemalloc
-LOCAL_SHARED_LIBRARIES += libgenlock libQcomUI libGLESv1_CM
+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/libqcomui
+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\" \
@@ -48,7 +48,7 @@
 include $(CLEAR_VARS)
 LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
-LOCAL_C_INCLUDES := hardware/qcom/display/libqcomui
+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\"

libgralloc/alloc_controller.cpp

diff --git a/libgralloc/alloc_controller.cpp b/libgralloc/alloc_controller.cpp
index 1356b2f..5d0cf2b 100644
--- a/libgralloc/alloc_controller.cpp
+++ b/libgralloc/alloc_controller.cpp
@@ -37,9 +37,10 @@
 #include "pmemalloc.h"
 #include "ashmemalloc.h"
 #include "gr.h"
-#include "qcomutils/comptype.h"
+#include "comptype.h"
 
 using namespace gralloc;
+using namespace qdutils;
 using android::sp;
 
 const int GRALLOC_HEAP_MASK  =  GRALLOC_USAGE_PRIVATE_ADSP_HEAP      |
@@ -62,7 +63,8 @@
     // 4. The heap type is protected
     // 5. The buffer is meant for external display only
 
-    if(QCCompositionType::getInstance().getCompositionType() & COMPOSITION_TYPE_MDP)
+    if(QCCompositionType::getInstance().getCompositionType() &
+       COMPOSITION_TYPE_MDP)
         return false;
     if(triedSystem)
         return false;

libgralloc/framebuffer.cpp

diff --git a/libgralloc/framebuffer.cpp b/libgralloc/framebuffer.cpp
index c3a6b93..97295a3 100644
--- a/libgralloc/framebuffer.cpp
+++ b/libgralloc/framebuffer.cpp
@@ -40,7 +40,7 @@
 #include "fb_priv.h"
 #include "gr.h"
 #include <cutils/properties.h>
-#include <qcomutils/profiler.h>
+#include <profiler.h>
 
 #include "overlay.h"
 namespace ovutils = overlay::utils;