Merge remote-tracking branch 'caf/LA.BR.1.3.7_rb1.4' into lineage-15.0-caf-8952
diff --git a/Android.mk b/Android.mk
index 9eb272f..1065b21 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,10 +1,12 @@
+ifeq ($(call my-dir),$(call project-path-for,qcom-display))
+
ifeq ($(call is-board-platform-in-list, msm8996),true)
TARGET_USES_SDM = true
else
TARGET_USES_SDM = false
endif
-display-hals := libgralloc libcopybit liblight libmemtrack libqservice libqdutils
+display-hals := libgralloc libcopybit libmemtrack libqservice libqdutils
display-hals += hdmi_cec
ifeq ($(TARGET_USES_SDM), true)
@@ -14,6 +16,9 @@
display-hals += libgenlock libhwcomposer liboverlay libhdmi
endif
+ifneq ($(TARGET_PROVIDES_LIBLIGHT),true)
+display-hals += liblight
+endif
ifeq ($(call is-vendor-board-platform,QCOM),true)
include $(call all-named-subdir-makefiles,$(display-hals))
else
@@ -21,3 +26,5 @@
include $(call all-named-subdir-makefiles,$(display-hals))
endif
endif
+
+endif
diff --git a/common.mk b/common.mk
index 92a285b..8a999f7 100644
--- a/common.mk
+++ b/common.mk
@@ -1,11 +1,11 @@
#Common headers
-common_includes := $(LOCAL_PATH)/../libgralloc
-common_includes += $(LOCAL_PATH)/../liboverlay
-common_includes += $(LOCAL_PATH)/../libcopybit
-common_includes += $(LOCAL_PATH)/../libqdutils
-common_includes += $(LOCAL_PATH)/../libhwcomposer
-common_includes += $(LOCAL_PATH)/../libhdmi
-common_includes += $(LOCAL_PATH)/../libqservice
+common_includes := $(call project-path-for,qcom-display)/libgralloc
+common_includes += $(call project-path-for,qcom-display)/liboverlay
+common_includes += $(call project-path-for,qcom-display)/libcopybit
+common_includes += $(call project-path-for,qcom-display)/libqdutils
+common_includes += $(call project-path-for,qcom-display)/libhwcomposer
+common_includes += $(call project-path-for,qcom-display)/libhdmi
+common_includes += $(call project-path-for,qcom-display)/libqservice
common_header_export_path := qcom/display
@@ -35,7 +35,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
diff --git a/libhwcomposer/hwc_utils.h b/libhwcomposer/hwc_utils.h
index a910e48..8bdc7ed 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>
@@ -50,10 +51,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;
diff --git a/liboverlay/overlayUtils.cpp b/liboverlay/overlayUtils.cpp
index 5e31556..d87bee6 100644
--- a/liboverlay/overlayUtils.cpp
+++ b/liboverlay/overlayUtils.cpp
@@ -37,9 +37,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 {
diff --git a/sdm/libs/core/Android.mk b/sdm/libs/core/Android.mk
index f9c7df7..2464c20 100644
--- a/sdm/libs/core/Android.mk
+++ b/sdm/libs/core/Android.mk
@@ -3,7 +3,7 @@
LOCAL_MODULE := libsdmcore
LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := hardware/qcom/display/sdm/include/ \
+LOCAL_C_INCLUDES := $(call project-path-for,qcom-display)/sdm/include/ \
$(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_CFLAGS := -Wno-missing-field-initializers -Wno-unused-parameter \
-Wconversion -Wall -Werror \
diff --git a/sdm/libs/hwc/Android.mk b/sdm/libs/hwc/Android.mk
index 56992d4..c50646c 100644
--- a/sdm/libs/hwc/Android.mk
+++ b/sdm/libs/hwc/Android.mk
@@ -4,11 +4,11 @@
LOCAL_MODULE := hwcomposer.$(TARGET_BOARD_PLATFORM)
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := hardware/qcom/display/sdm/include/ \
- hardware/qcom/display/libgralloc/ \
- hardware/qcom/display/libqservice/ \
- hardware/qcom/display/libqdutils/ \
- hardware/qcom/display/libcopybit/
+LOCAL_C_INCLUDES := $(call project-path-for,qcom-display)/sdm/include/ \
+ $(call project-path-for,qcom-display)/libgralloc/ \
+ $(call project-path-for,qcom-display)/libqservice/ \
+ $(call project-path-for,qcom-display)/libqdutils/ \
+ $(call project-path-for,qcom-display)/libcopybit/
LOCAL_CFLAGS := -Wno-missing-field-initializers -Wno-unused-parameter \
-Wconversion -Wall -Werror \
diff --git a/sdm/libs/utils/Android.mk b/sdm/libs/utils/Android.mk
index 9de5c07..c8df3c0 100644
--- a/sdm/libs/utils/Android.mk
+++ b/sdm/libs/utils/Android.mk
@@ -3,7 +3,7 @@
LOCAL_MODULE := libsdmutils
LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := hardware/qcom/display/sdm/include/
+LOCAL_C_INCLUDES := $(call project-path-for,qcom-display)/sdm/include/
LOCAL_CFLAGS := -Wno-missing-field-initializers -Wno-unused-parameter \
-Wconversion -Wall -Werror \
-DLOG_TAG=\"SDM\"