diff --git a/Android.mk b/Android.mk
index ea217db6..2ffdf003 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,6 +17,8 @@ LOCAL_PATH := $(call my-dir)
 include $(call all-makefiles-under,$(LOCAL_PATH))
 
 # Common
+ifeq ($(call is-board-platform-in-list,$(QCOM_BOARD_PLATFORMS)),true)
 ifeq ($(TARGET_FWK_SUPPORTS_FULL_VALUEADDS),true)
 -include vendor/qcom/opensource/core-utils/build/AndroidBoardCommon.mk
 endif
+endif