display: Makefile changes for AOSP builds

- On some builds, the display HAL can be located in a subdirectory.
Use LOCAL_PATH to include local headers.
- Use msm and apq filters to pick up the qcom display HAL.

Conflicts:
        msm8226/Android.mk
        msm8226/common.mk

Change-Id: Ib9b47ececb37fda1ecde5ce1cbe1fce9b041f84a
This commit is contained in:
Naseer Ahmed 2014-04-11 19:46:04 -04:00 committed by Simon Wilson
parent eff8db6f52
commit d0e20d1a84
2 changed files with 9 additions and 10 deletions

View File

@ -4,8 +4,7 @@ display-hals += libmemtrack
ifeq ($(call is-vendor-board-platform,QCOM),true)
include $(call all-named-subdir-makefiles,$(display-hals))
else
ifneq ($(filter msm8226 msm8x26,$(TARGET_BOARD_PLATFORM)),)
#This is for mako since it doesn't have the QCOM make functions
ifneq ($(filter msm% apq%,$(TARGET_BOARD_PLATFORM)),)
include $(call all-named-subdir-makefiles,$(display-hals))
endif
endif

View File

@ -1,12 +1,12 @@
#Common headers
common_includes := hardware/qcom/display/msm8226/libgralloc
common_includes += hardware/qcom/display/msm8226/liboverlay
common_includes += hardware/qcom/display/msm8226/libcopybit
common_includes += hardware/qcom/display/msm8226/libqdutils
common_includes += hardware/qcom/display/msm8226/libhwcomposer
common_includes += hardware/qcom/display/msm8226/libexternal
common_includes += hardware/qcom/display/msm8226/libqservice
common_includes += hardware/qcom/display/msm8226/libvirtual
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)/../libexternal
common_includes += $(LOCAL_PATH)/../libqservice
common_includes += $(LOCAL_PATH)/../libvirtual
ifeq ($(TARGET_USES_POST_PROCESSING),true)
common_flags += -DUSES_POST_PROCESSING