diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-10-21 18:30:08 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-21 18:30:08 +0000 |
commit | aa09ccb7c0b2fc75a99aa8d9f7624464789d3387 (patch) | |
tree | 6dd20f30cf41c459e8fd6ec8604ed10791395d55 | |
parent | 6759f7f16b09d209ba24af309c8f167496e51e57 (diff) | |
parent | ba6c2b14ea629a548bb1f53b87b2f2f1cee63ade (diff) | |
download | display-aa09ccb7c0b2fc75a99aa8d9f7624464789d3387.tar.gz |
Merge "Replace is-vendor-board-platform with is-vendor-board-qcom." am: abf3ff986d am: 651ca42903 am: 3cdd168942 am: ba6c2b14ea
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/1866281
Change-Id: Ib7e388e68bc86f945fa7b69ea8c2357c47aabf81
-rw-r--r-- | msm8084/Android.mk | 2 | ||||
-rw-r--r-- | msm8226/Android.mk | 2 | ||||
-rw-r--r-- | msm8226/common.mk | 2 | ||||
-rw-r--r-- | msm8909/Android.mk | 2 | ||||
-rw-r--r-- | msm8909w_3100/Android.mk | 2 | ||||
-rw-r--r-- | msm8960/Android.mk | 2 | ||||
-rw-r--r-- | msm8960/common.mk | 2 | ||||
-rw-r--r-- | msm8994/Android.mk | 2 | ||||
-rw-r--r-- | msm8996/Android.mk | 2 | ||||
-rw-r--r-- | msm8998/Android.mk | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/msm8084/Android.mk b/msm8084/Android.mk index 59a97517..fbb5aea7 100644 --- a/msm8084/Android.mk +++ b/msm8084/Android.mk @@ -1,7 +1,7 @@ display-hals := libgralloc libcopybit liblight libvirtual display-hals += libhwcomposer liboverlay libqdutils libexternal libqservice 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)) else ifneq ($(filter msm% apq%,$(TARGET_BOARD_PLATFORM)),) diff --git a/msm8226/Android.mk b/msm8226/Android.mk index 59a97517..fbb5aea7 100644 --- a/msm8226/Android.mk +++ b/msm8226/Android.mk @@ -1,7 +1,7 @@ display-hals := libgralloc libcopybit liblight libvirtual display-hals += libhwcomposer liboverlay libqdutils libexternal libqservice 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)) else ifneq ($(filter msm% apq%,$(TARGET_BOARD_PLATFORM)),) diff --git a/msm8226/common.mk b/msm8226/common.mk index e8a434ec..887c2a3e 100644 --- a/msm8226/common.mk +++ b/msm8226/common.mk @@ -56,7 +56,7 @@ ifneq (,$(DISPLAY_FEATURE_MAX_ROT_SESSION)) common_flags += -DTARGET_SPECIFIC_MAX_ROT_SESSION=$(DISPLAY_FEATURE_MAX_ROT_SESSION) 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. # If the macro above is defined, we make the assumption that we have the kernel # available in the build tree. diff --git a/msm8909/Android.mk b/msm8909/Android.mk index f354caf5..7c2ea92d 100644 --- a/msm8909/Android.mk +++ b/msm8909/Android.mk @@ -8,7 +8,7 @@ endif 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)) else ifneq ($(filter msm% apq%,$(TARGET_BOARD_PLATFORM)),) diff --git a/msm8909w_3100/Android.mk b/msm8909w_3100/Android.mk index 1a285bf7..a963cf1b 100644 --- a/msm8909w_3100/Android.mk +++ b/msm8909w_3100/Android.mk @@ -12,7 +12,7 @@ else display-hals += libgralloc1 endif -ifeq ($(call is-vendor-board-platform,QCOM),true) +ifneq (,$(call is-vendor-board-qcom)) include $(call all-named-subdir-makefiles,$(display-hals)) else ifneq ($(filter msm% apq%,$(TARGET_BOARD_PLATFORM)),) diff --git a/msm8960/Android.mk b/msm8960/Android.mk index 13a00545..f035c1cc 100644 --- a/msm8960/Android.mk +++ b/msm8960/Android.mk @@ -1,7 +1,7 @@ display-hals := libgralloc libgenlock libcopybit liblight display-hals += libhwcomposer liboverlay libqdutils libexternal libqservice 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)) else ifneq ($(filter msm8226 msm8x26 msm8960 msm8974 msm8x74,$(TARGET_BOARD_PLATFORM)),) diff --git a/msm8960/common.mk b/msm8960/common.mk index fcbcfb5d..f385d4ea 100644 --- a/msm8960/common.mk +++ b/msm8960/common.mk @@ -33,7 +33,7 @@ common_deps := kernel_includes := # Executed only on QCOM BSPs -ifeq ($(call is-vendor-board-platform,QCOM),true) +ifneq (,$(call is-vendor-board-qcom)) common_flags += -DQCOM_BSP common_deps += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr kernel_includes += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include diff --git a/msm8994/Android.mk b/msm8994/Android.mk index a0644d7b..0189300c 100644 --- a/msm8994/Android.mk +++ b/msm8994/Android.mk @@ -1,7 +1,7 @@ display-hals := libgralloc libcopybit liblight libmemtrack libqservice 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)) else ifneq ($(filter msm% apq%,$(TARGET_BOARD_PLATFORM)),) diff --git a/msm8996/Android.mk b/msm8996/Android.mk index b5961ad0..1864f922 100644 --- a/msm8996/Android.mk +++ b/msm8996/Android.mk @@ -9,7 +9,7 @@ display-hals += hdmi_cec sdm-libs := sdm/libs 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)) else ifneq ($(filter msm% apq%,$(TARGET_BOARD_PLATFORM)),) diff --git a/msm8998/Android.mk b/msm8998/Android.mk index 30ab70fc..5f99c0e3 100644 --- a/msm8998/Android.mk +++ b/msm8998/Android.mk @@ -8,7 +8,7 @@ endif 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)) else ifneq ($(filter msm% apq%,$(TARGET_BOARD_PLATFORM)),) |