display: Use common includes in SDM
Unifies builds with and without MSM kernels
Change-Id: I60e082f64591768d14ce102e815d2076a53384b0
CRs-fixed: 999563
diff --git a/common.mk b/common.mk
index 0142a68..fb955a2 100644
--- a/common.mk
+++ b/common.mk
@@ -1,8 +1,10 @@
#Common headers
-common_includes := $(LOCAL_PATH)/../libgralloc
-common_includes += $(LOCAL_PATH)/../libcopybit
-common_includes += $(LOCAL_PATH)/../libqdutils
-common_includes += $(LOCAL_PATH)/../libqservice
+display_top := $(call my-dir)
+
+common_includes := $(display_top)/libqdutils
+common_includes += $(display_top)/libqservice
+common_includes += $(display_top)/libcopybit
+common_includes += $(display_top)/sdm/include
common_header_export_path := qcom/display
@@ -12,6 +14,7 @@
#Common C flags
common_flags := -DDEBUG_CALC_FPS -Wno-missing-field-initializers
common_flags += -Wconversion -Wall -Werror
+common_flags += -isystem $(display_top)/libgralloc
ifeq ($(TARGET_USES_POST_PROCESSING),true)
common_flags += -DUSES_POST_PROCESSING
@@ -33,15 +36,7 @@
common_deps :=
kernel_includes :=
-# Executed only on QCOM BSPs
-ifeq ($(TARGET_USES_QCOM_BSP),true)
-# Enable QCOM Display features
- common_flags += -DQCOM_BSP
-endif
-ifneq ($(call is-platform-sdk-version-at-least,18),true)
- common_flags += -DANDROID_JELLYBEAN_MR1=1
-endif
-ifeq ($(call is-vendor-board-platform,QCOM),true)
+ifeq ($(TARGET_COMPILE_WITH_MSM_KERNEL),true)
# This check is to pick the kernel headers from the right location.
# If the macro above is defined, we make the assumption that we have the kernel
# available in the build tree.
diff --git a/sdm/libs/core/Android.mk b/sdm/libs/core/Android.mk
index c468420..218ff98 100644
--- a/sdm/libs/core/Android.mk
+++ b/sdm/libs/core/Android.mk
@@ -1,18 +1,17 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
+include $(LOCAL_PATH)/../../../common.mk
LOCAL_MODULE := libsdmcore
LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := hardware/qcom/display/sdm/include/ \
- $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
- external/libcxx/include/
+LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
LOCAL_CFLAGS := -Wno-missing-field-initializers -Wno-unused-parameter \
- -Wall -Werror -Wconversion -std=c++11 -fcolor-diagnostics\
- -DLOG_TAG=\"SDM\"
+ -std=c++11 -fcolor-diagnostics\
+ -DLOG_TAG=\"SDM\" $(common_flags)
LOCAL_CLANG := true
LOCAL_HW_INTF_PATH := fb
LOCAL_SHARED_LIBRARIES := libdl libsdmutils libc++
-LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps)
LOCAL_SRC_FILES := core_interface.cpp \
core_impl.cpp \
display_base.cpp \
diff --git a/sdm/libs/hwc/Android.mk b/sdm/libs/hwc/Android.mk
index d711366..8ce3757 100644
--- a/sdm/libs/hwc/Android.mk
+++ b/sdm/libs/hwc/Android.mk
@@ -1,32 +1,17 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
+include $(LOCAL_PATH)/../../../common.mk
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/libqservice/ \
- hardware/qcom/display/libqdutils/ \
- hardware/qcom/display/libcopybit/ \
- external/libcxx/include/
+LOCAL_C_INCLUDES := $(common_includes)
LOCAL_CFLAGS := -Wno-missing-field-initializers -Wno-unused-parameter \
- -Wall -Werror -Wconversion -std=c++11 -fcolor-diagnostics\
- -DLOG_TAG=\"SDM\" -DDEBUG_CALC_FPS
-LOCAL_CFLAGS += -isystem hardware/qcom/display/libgralloc
+ -std=c++11 -fcolor-diagnostics\
+ -DLOG_TAG=\"SDM\" $(common_flags)
LOCAL_CLANG := true
-# TODO: Move this to the common makefile
-ifeq ($(call is-board-platform-in-list, $(MASTER_SIDE_CP_TARGET_LIST)), true)
- LOCAL_CFLAGS += -DMASTER_SIDE_CP
-endif
-
-
-ifeq ($(TARGET_USES_QCOM_BSP),true)
-# Enable QCOM Display features
-LOCAL_CFLAGS += -DQTI_BSP
-endif
-
LOCAL_SHARED_LIBRARIES := libsdmcore libqservice libbinder libhardware libhardware_legacy \
libutils libcutils libsync libmemalloc libqdutils libdl \
libpowermanager libsdmutils libc++
diff --git a/sdm/libs/utils/Android.mk b/sdm/libs/utils/Android.mk
index 8125b49..f482a6d 100644
--- a/sdm/libs/utils/Android.mk
+++ b/sdm/libs/utils/Android.mk
@@ -1,13 +1,13 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
+include $(LOCAL_PATH)/../../../common.mk
LOCAL_MODULE := libsdmutils
LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := hardware/qcom/display/sdm/include/
+LOCAL_C_INCLUDES := $(common_includes)
LOCAL_CFLAGS := -Wno-missing-field-initializers \
- -Wall -Werror -Wconversion \
-std=c++11 -fcolor-diagnostics\
- -DLOG_TAG=\"SDM\"
+ -DLOG_TAG=\"SDM\" $(common_flags)
LOCAL_CLANG := true
LOCAL_SRC_FILES := debug.cpp \
rect.cpp \
