diff --git a/msm8084/Android.mk b/msm8084/Android.mk
index 59a97517a..fbb5aea79 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 59a97517a..fbb5aea79 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 e8a434ec4..887c2a3ec 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 f354caf59..7c2ea92d7 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 1a285bf71..a963cf1b2 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 13a00545a..f035c1cce 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 fcbcfb5dd..f385d4ea7 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 a0644d7b1..0189300cd 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 b5961ad0c..1864f922f 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 30ab70fc7..5f99c0e35 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)),)