diff options
| author | Naseer Ahmed <naseer@codeaurora.org> | 2016-05-13 12:44:52 -0400 |
|---|---|---|
| committer | Naseer Ahmed <naseer@codeaurora.org> | 2016-05-13 15:03:43 -0400 |
| commit | 57db735386f6a603a2e7982cd5b214ce9530e879 (patch) | |
| tree | 9cfe012a9ff578b95f427f60901749ffbd582c86 /common.mk | |
| parent | 41451ddbd433a2b3477fb565fba49896fceed1a1 (diff) | |
| parent | 33d6fee3222dca85952a882fa23cc8a6a9731dcc (diff) | |
| download | display-57db735386f6a603a2e7982cd5b214ce9530e879.tar.gz | |
Merge branch 'LA.HB.1.3.9' into display.lnx.3.0-dev
Merge in newer HALs not present earlier in this branch
Change-Id: I2832d00beccf86dd0929b78c6be1be5f2b0881fe
CRs-fixed: 1015411
Diffstat (limited to 'common.mk')
| -rw-r--r-- | common.mk | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -1,6 +1,8 @@ #Common headers display_top := $(call my-dir) +use_hwc2 := false + common_includes := $(display_top)/libqdutils common_includes += $(display_top)/libqservice common_includes += $(display_top)/libcopybit @@ -14,7 +16,11 @@ 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 +ifneq ($(TARGET_USES_GRALLOC1), true) + common_flags += -isystem $(display_top)/libgralloc +else + common_flags += -isystem $(display_top)/libgralloc1 +endif ifeq ($(TARGET_USES_POST_PROCESSING),true) common_flags += -DUSES_POST_PROCESSING @@ -41,9 +47,7 @@ kernel_includes := # Enable QCOM Display features # common_flags += -DQTI_BSP # endif -ifneq ($(call is-platform-sdk-version-at-least,18),true) - common_flags += -DANDROID_JELLYBEAN_MR1=1 -endif + 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 |