commit a9daf15d87b0d1f9a7ce61c92d1b7b2eec45b2ae
author Dan Willemsen <dwillemsen@google.com> Fri Nov 11 05:35:04 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 11 05:35:05 2016 +0000
tree ca01f3853ef9b1a208000453d2bbb1a3a0fa2524
parent 0f185d7c3b466a587a8593a8f7b32fb9ce6e51b4
parent 1ff5fa11c4720bcd1a6d6ef9b0508089655645fd

Merge "Fix vendor/google/build/ninja_config.mk"

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 8d5d31a..2fcf1fe 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -859,7 +859,6 @@
 
 ifndef KATI
 include $(BUILD_SYSTEM)/ninja_config.mk
--include vendor/google/build/ninja_config.mk
 include $(BUILD_SYSTEM)/soong_config.mk
 endif
 

core/ninja_config.mk

diff --git a/core/ninja_config.mk b/core/ninja_config.mk
index ab88515..f456b8b 100644
--- a/core/ninja_config.mk
+++ b/core/ninja_config.mk
@@ -60,6 +60,8 @@
 	win_sdk \
 	winsdk-tools
 
+include $(wildcard vendor/*/build/ninja_config.mk)
+
 # Any Android goals that need to be built.
 ANDROID_GOALS := $(filter-out $(KATI_OUTPUT_PATTERNS) $(CKATI) $(MAKEPARALLEL),\
     $(sort $(ORIGINAL_MAKECMDGOALS) $(MAKECMDGOALS)))