summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArne Coucheron <arco68@gmail.com>2016-01-09 13:16:37 +0100
committerRashed Abdel-Tawab <rashed@linux.com>2016-01-11 17:53:50 -0500
commitfc41c61f3bdc2b4d985687ebc8d0e2306948ca65 (patch)
treea6cbee55126dcfffc76c863f0d4645da24c65865
parent844cca41412f35f0a434b555f10de423a523bf4c (diff)
downloadandroid_hardware_qcom_display-stable/cm-13.0-caf-8084-ZNH0E.tar.gz
android_hardware_qcom_display-stable/cm-13.0-caf-8084-ZNH0E.tar.bz2
android_hardware_qcom_display-stable/cm-13.0-caf-8084-ZNH0E.zip
hwc: Fix compile errors after display-frameworks removalstable/cm-13.0-caf-8084-ZNH0E
Change-Id: I62d545e9f8dea169914a0da09d952efe2ce3f2d3
-rw-r--r--common.mk1
-rw-r--r--libhwcomposer/hwc_utils.h4
-rw-r--r--liboverlay/overlayUtils.cpp4
3 files changed, 2 insertions, 7 deletions
diff --git a/common.mk b/common.mk
index 048db61b3..37081f1b5 100644
--- a/common.mk
+++ b/common.mk
@@ -40,7 +40,6 @@ kernel_includes :=
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
diff --git a/libhwcomposer/hwc_utils.h b/libhwcomposer/hwc_utils.h
index 0d75b0515..0a12984d8 100644
--- a/libhwcomposer/hwc_utils.h
+++ b/libhwcomposer/hwc_utils.h
@@ -26,6 +26,7 @@
#include <fcntl.h>
#include <math.h>
+#include <hardware/display_defs.h>
#include <hardware/hwcomposer.h>
#include <gr.h>
#include <gralloc_priv.h>
@@ -45,9 +46,6 @@
#define HWC_WFDDISPSYNC_LOG 0
#define STR(f) #f;
-#ifdef QTI_BSP
-#include <exhwcomposer_defs.h>
-#endif
//Fwrd decls
struct hwc_context_t;
diff --git a/liboverlay/overlayUtils.cpp b/liboverlay/overlayUtils.cpp
index ca8095431..47889a274 100644
--- a/liboverlay/overlayUtils.cpp
+++ b/liboverlay/overlayUtils.cpp
@@ -29,6 +29,7 @@
#include <stdlib.h>
#include <math.h>
+#include <hardware/display_defs.h>
#include <utils/Log.h>
#include <linux/msm_mdp.h>
#include <cutils/properties.h>
@@ -37,9 +38,6 @@
#include "mdpWrapper.h"
#include "mdp_version.h"
#include <hardware/hwcomposer_defs.h>
-#ifdef QTI_BSP
-#include <exhwcomposer_defs.h>
-#endif
// just a helper static thingy
namespace {