From 3b03ae3a3cfa51c03b8ca678de7ce65737387137 Mon Sep 17 00:00:00 2001
From: Adnan Begovic <adnan@cyngn.com>
Date: Tue, 26 May 2015 18:21:15 -0700
Subject: [PATCH] build/core: Inherit vendor/* makefiles for check-api.

Change-Id: I72d409075192b18c35068566c5687092d45be9b4
---
 core/clear_vars.mk | 3 ++-
 core/config.mk     | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 64c1e0b3b..c1a1c5b15 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -365,7 +365,8 @@ LOCAL_INIT_RC_32:=
 LOCAL_INIT_RC_64:=
 LOCAL_JAVA_LANGUAGE_VERSION:=
 
-LOCAL_IGNORE_SUBDIR:=
+# Include any vendor specific clear_vars.mk file
+-include $(TOPDIR)vendor/*/build/core/clear_vars.mk
 
 # Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to
 # iterate over thousands of entries every time.
diff --git a/core/config.mk b/core/config.mk
index a7c66787f..47a1e634f 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -896,6 +896,13 @@ ifneq ($(CM_BUILD),)
 ## We need to be sure the global selinux policies are included
 ## last, to avoid accidental resetting by device configs
 $(eval include vendor/cm/sepolicy/sepolicy.mk)
+
+# Include any vendor specific config.mk file
+-include $(TOPDIR)vendor/*/build/core/config.mk
+
+# Include any vendor specific apicheck.mk file
+-include $(TOPDIR)vendor/*/build/core/apicheck.mk
+
 endif
 
 include $(BUILD_SYSTEM)/dumpvar.mk
-- 
2.11.0