Merge "Replace is-vendor-board-platform with is-vendor-board-qcom." am: 88f21b8e1c am: 54fcaa9259 am: fef3293bca am: 54ce7a8aa1

Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/bt/+/1866353

Change-Id: Iba693c1765f0ef385cc252fa9fbf32d96d332c81
diff --git a/msm8909w_3100/Android.mk b/msm8909w_3100/Android.mk
index cd2c3ae..53dea9f 100644
--- a/msm8909w_3100/Android.mk
+++ b/msm8909w_3100/Android.mk
@@ -1,3 +1,3 @@
-ifeq ($(call is-vendor-board-platform,QCOM),true)
+ifneq (,$(call is-vendor-board-qcom))
 include $(call all-named-subdir-makefiles,libbt-vendor)
 endif # is-vendor-board-platform
diff --git a/msm8998/Android.mk b/msm8998/Android.mk
index cd2c3ae..53dea9f 100644
--- a/msm8998/Android.mk
+++ b/msm8998/Android.mk
@@ -1,3 +1,3 @@
-ifeq ($(call is-vendor-board-platform,QCOM),true)
+ifneq (,$(call is-vendor-board-qcom))
 include $(call all-named-subdir-makefiles,libbt-vendor)
 endif # is-vendor-board-platform