commit cc88b7b82cb67b37cc1a9a9dc7b4877144507c2d
author Linux Build Service Account <lnxbuild@localhost> Tue Jan 12 09:38:56 2016 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Jan 12 09:38:56 2016 -0800
tree 7174c3bc0456505a5987c9e3bc3640eee3df9d02
parent 77ecff8e012e8de8cda4f8e5d49a77f423344f18
parent acc57fb4e4b7057bbf86958a1321970abc5fc16f

Merge "hwc: Use display_defs.h"

common.mk

diff --git a/common.mk b/common.mk
index cdf660c..6cbfe38 100644
--- a/common.mk
+++ b/common.mk
@@ -46,7 +46,6 @@
 ifeq ($(TARGET_USES_QCOM_BSP),true)
 # Enable QCOM Display features
     common_flags += -DQTI_BSP
-    common_includes += vendor/qcom/opensource/display-frameworks/include
 endif
 ifneq ($(call is-platform-sdk-version-at-least,18),true)
     common_flags += -DANDROID_JELLYBEAN_MR1=1

libhwcomposer/hwc_utils.h

diff --git a/libhwcomposer/hwc_utils.h b/libhwcomposer/hwc_utils.h
index cdf1115..62ca235 100644
--- a/libhwcomposer/hwc_utils.h
+++ b/libhwcomposer/hwc_utils.h
@@ -32,6 +32,9 @@
 #include <overlayUtils.h>
 #include <EGL/egl.h>
 
+#ifdef QTI_BSP
+#include <hardware/display_defs.h>
+#endif
 
 #define ALIGN_TO(x, align)     (((x) + ((align)-1)) & ~((align)-1))
 #define LIKELY( exp )       (__builtin_expect( (exp) != 0, true  ))
@@ -42,10 +45,6 @@
 // Max number of PTOR layers handled
 #define MAX_PTOR_LAYERS 2
 
-#ifdef QTI_BSP
-#include <exhwcomposer_defs.h>
-#endif
-
 //Fwrd decls
 struct hwc_context_t;