Fix vendor/google/build/ninja_config.mk

This needs to be included between PARSE_TIME_MAKE_GOALS and KATI_GOALS

Test: m -j <target-from-internal>
Change-Id: I7284f05336b921d40f04ff5811a47bd0d17a066f

diff --git a/core/config.mk b/core/config.mk
index 8d5d31a..2fcf1fe 100644 (file)
--- 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 ab88515..f456b8b 100644 (file)
--- 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)))