Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918
Bug: 205056467
Merged-In: I6074236616646db7bfda7ea381af7b04775a4263
Change-Id: I8fbe24c4eafe4eccb1f552d8688e0b91ce1060c5
diff --git a/Android.mk b/Android.mk
index 76150c7..33cf5a4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -10,7 +10,7 @@
display-hals += gralloc
ifneq ($(BUILD_WITHOUT_VENDOR),true)
-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/common.mk b/common.mk
index fb4774a..83c4f1c 100644
--- a/common.mk
+++ b/common.mk
@@ -41,7 +41,7 @@
common_flags += -D__ARM_HAVE_NEON
endif
-ifeq ($(call is-board-platform-in-list, $(MASTER_SIDE_CP_TARGET_LIST)), true)
+ifneq (,$(call is-board-platform-in-list2, $(MASTER_SIDE_CP_TARGET_LIST)))
common_flags += -DMASTER_SIDE_CP
endif
