Merge "Replace is-vendor-board-platform with is-vendor-board-qcom." am: abf3ff986d am: 651ca42903
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/1866281 Change-Id: Idbc944c29776db8aa057fd195d88c82a34853a10
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
display-hals := libgralloc libcopybit liblight libvirtual
|
display-hals := libgralloc libcopybit liblight libvirtual
|
||||||
display-hals += libhwcomposer liboverlay libqdutils libexternal libqservice
|
display-hals += libhwcomposer liboverlay libqdutils libexternal libqservice
|
||||||
display-hals += libmemtrack
|
display-hals += libmemtrack
|
||||||
ifeq ($(call is-vendor-board-platform,QCOM),true)
|
ifneq (,$(call is-vendor-board-qcom))
|
||||||
include $(call all-named-subdir-makefiles,$(display-hals))
|
include $(call all-named-subdir-makefiles,$(display-hals))
|
||||||
else
|
else
|
||||||
ifneq ($(filter msm% apq%,$(TARGET_BOARD_PLATFORM)),)
|
ifneq ($(filter msm% apq%,$(TARGET_BOARD_PLATFORM)),)
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
display-hals := libgralloc libcopybit liblight libvirtual
|
display-hals := libgralloc libcopybit liblight libvirtual
|
||||||
display-hals += libhwcomposer liboverlay libqdutils libexternal libqservice
|
display-hals += libhwcomposer liboverlay libqdutils libexternal libqservice
|
||||||
display-hals += libmemtrack
|
display-hals += libmemtrack
|
||||||
ifeq ($(call is-vendor-board-platform,QCOM),true)
|
ifneq (,$(call is-vendor-board-qcom))
|
||||||
include $(call all-named-subdir-makefiles,$(display-hals))
|
include $(call all-named-subdir-makefiles,$(display-hals))
|
||||||
else
|
else
|
||||||
ifneq ($(filter msm% apq%,$(TARGET_BOARD_PLATFORM)),)
|
ifneq ($(filter msm% apq%,$(TARGET_BOARD_PLATFORM)),)
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ ifneq (,$(DISPLAY_FEATURE_MAX_ROT_SESSION))
|
|||||||
common_flags += -DTARGET_SPECIFIC_MAX_ROT_SESSION=$(DISPLAY_FEATURE_MAX_ROT_SESSION)
|
common_flags += -DTARGET_SPECIFIC_MAX_ROT_SESSION=$(DISPLAY_FEATURE_MAX_ROT_SESSION)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(call is-vendor-board-platform,QCOM),true)
|
ifneq (,$(call is-vendor-board-qcom))
|
||||||
# This check is to pick the kernel headers from the right location.
|
# 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
|
# If the macro above is defined, we make the assumption that we have the kernel
|
||||||
# available in the build tree.
|
# available in the build tree.
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ endif
|
|||||||
|
|
||||||
display-hals += gralloc
|
display-hals += gralloc
|
||||||
|
|
||||||
ifeq ($(call is-vendor-board-platform,QCOM),true)
|
ifneq (,$(call is-vendor-board-qcom))
|
||||||
include $(call all-named-subdir-makefiles,$(display-hals))
|
include $(call all-named-subdir-makefiles,$(display-hals))
|
||||||
else
|
else
|
||||||
ifneq ($(filter msm% apq%,$(TARGET_BOARD_PLATFORM)),)
|
ifneq ($(filter msm% apq%,$(TARGET_BOARD_PLATFORM)),)
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ else
|
|||||||
display-hals += libgralloc1
|
display-hals += libgralloc1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(call is-vendor-board-platform,QCOM),true)
|
ifneq (,$(call is-vendor-board-qcom))
|
||||||
include $(call all-named-subdir-makefiles,$(display-hals))
|
include $(call all-named-subdir-makefiles,$(display-hals))
|
||||||
else
|
else
|
||||||
ifneq ($(filter msm% apq%,$(TARGET_BOARD_PLATFORM)),)
|
ifneq ($(filter msm% apq%,$(TARGET_BOARD_PLATFORM)),)
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
display-hals := libgralloc libgenlock libcopybit liblight
|
display-hals := libgralloc libgenlock libcopybit liblight
|
||||||
display-hals += libhwcomposer liboverlay libqdutils libexternal libqservice
|
display-hals += libhwcomposer liboverlay libqdutils libexternal libqservice
|
||||||
display-hals += libmemtrack
|
display-hals += libmemtrack
|
||||||
ifeq ($(call is-vendor-board-platform,QCOM),true)
|
ifneq (,$(call is-vendor-board-qcom))
|
||||||
include $(call all-named-subdir-makefiles,$(display-hals))
|
include $(call all-named-subdir-makefiles,$(display-hals))
|
||||||
else
|
else
|
||||||
ifneq ($(filter msm8226 msm8x26 msm8960 msm8974 msm8x74,$(TARGET_BOARD_PLATFORM)),)
|
ifneq ($(filter msm8226 msm8x26 msm8960 msm8974 msm8x74,$(TARGET_BOARD_PLATFORM)),)
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ common_deps :=
|
|||||||
kernel_includes :=
|
kernel_includes :=
|
||||||
|
|
||||||
# Executed only on QCOM BSPs
|
# Executed only on QCOM BSPs
|
||||||
ifeq ($(call is-vendor-board-platform,QCOM),true)
|
ifneq (,$(call is-vendor-board-qcom))
|
||||||
common_flags += -DQCOM_BSP
|
common_flags += -DQCOM_BSP
|
||||||
common_deps += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
|
common_deps += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
|
||||||
kernel_includes += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
|
kernel_includes += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
display-hals := libgralloc libcopybit liblight libmemtrack libqservice
|
display-hals := libgralloc libcopybit liblight libmemtrack libqservice
|
||||||
display-hals += libhwcomposer liboverlay libqdutils libhdmi
|
display-hals += libhwcomposer liboverlay libqdutils libhdmi
|
||||||
|
|
||||||
ifeq ($(call is-vendor-board-platform,QCOM),true)
|
ifneq (,$(call is-vendor-board-qcom))
|
||||||
include $(call all-named-subdir-makefiles,$(display-hals))
|
include $(call all-named-subdir-makefiles,$(display-hals))
|
||||||
else
|
else
|
||||||
ifneq ($(filter msm% apq%,$(TARGET_BOARD_PLATFORM)),)
|
ifneq ($(filter msm% apq%,$(TARGET_BOARD_PLATFORM)),)
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ display-hals += hdmi_cec
|
|||||||
sdm-libs := sdm/libs
|
sdm-libs := sdm/libs
|
||||||
display-hals += $(sdm-libs)/utils $(sdm-libs)/core $(sdm-libs)/hwc $(sdm-libs)/hwc2
|
display-hals += $(sdm-libs)/utils $(sdm-libs)/core $(sdm-libs)/hwc $(sdm-libs)/hwc2
|
||||||
|
|
||||||
ifeq ($(call is-vendor-board-platform,QCOM),true)
|
ifneq (,$(call is-vendor-board-qcom))
|
||||||
include $(call all-named-subdir-makefiles,$(display-hals))
|
include $(call all-named-subdir-makefiles,$(display-hals))
|
||||||
else
|
else
|
||||||
ifneq ($(filter msm% apq%,$(TARGET_BOARD_PLATFORM)),)
|
ifneq ($(filter msm% apq%,$(TARGET_BOARD_PLATFORM)),)
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ endif
|
|||||||
|
|
||||||
display-hals += libgralloc1
|
display-hals += libgralloc1
|
||||||
|
|
||||||
ifeq ($(call is-vendor-board-platform,QCOM),true)
|
ifneq (,$(call is-vendor-board-qcom))
|
||||||
include $(call all-named-subdir-makefiles,$(display-hals))
|
include $(call all-named-subdir-makefiles,$(display-hals))
|
||||||
else
|
else
|
||||||
ifneq ($(filter msm% apq%,$(TARGET_BOARD_PLATFORM)),)
|
ifneq ($(filter msm% apq%,$(TARGET_BOARD_PLATFORM)),)
|
||||||
|
|||||||
Reference in New Issue
Block a user