summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/config.mk1
-rw-r--r--core/ninja_config.mk2
2 files changed, 2 insertions, 1 deletions
diff --git a/core/config.mk b/core/config.mk
index 8d5d31a7f0..2fcf1fe132 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -859,7 +859,6 @@ dont_bother_goals := clean clobber dataclean installclean \
ifndef KATI
include $(BUILD_SYSTEM)/ninja_config.mk
--include vendor/google/build/ninja_config.mk
include $(BUILD_SYSTEM)/soong_config.mk
endif
diff --git a/core/ninja_config.mk b/core/ninja_config.mk
index ab885151dc..f456b8b161 100644
--- a/core/ninja_config.mk
+++ b/core/ninja_config.mk
@@ -60,6 +60,8 @@ PARSE_TIME_MAKE_GOALS := \
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)))