commit da85fecaf1ea12f93b49c690e36fa89b93614a33
author Dan Willemsen <dwillemsen@google.com> Fri Nov 11 21:38:53 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 11 21:38:53 2016 +0000
tree 046e84a22f00df76356abae744eedbabd304c920
parent a9daf15d87b0d1f9a7ce61c92d1b7b2eec45b2ae
parent 461d844a40a73aa98f08f1d0a8d80b183c6e0dff

Merge "Remove transform-d-to-p"

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)))