diff options
| author | Naseer Ahmed <naseer@codeaurora.org> | 2016-04-05 17:40:02 -0400 |
|---|---|---|
| committer | Naseer Ahmed <naseer@codeaurora.org> | 2016-04-06 14:58:37 -0400 |
| commit | d68b47d1ccd060f9b2ca8e2357f3515bed9ee348 (patch) | |
| tree | d70c6a515c01b54c233c2b5042a9294ce11cb8ed /common.mk | |
| parent | 0bcd125deb2656f57c2bfcd02ee0b777380bfbd8 (diff) | |
| download | display-d68b47d1ccd060f9b2ca8e2357f3515bed9ee348.tar.gz | |
display: Use common includes in SDM
Unifies builds with and without MSM kernels
Change-Id: I60e082f64591768d14ce102e815d2076a53384b0
CRs-fixed: 999563
Diffstat (limited to 'common.mk')
| -rw-r--r-- | common.mk | 21 |
1 files changed, 8 insertions, 13 deletions
@@ -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_libs := liblog libutils libcutils libhardware #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 @@ endif 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. |