am b384eb84: Merge "kati: Handle MAKECMDGOALS modifications"
* commit 'b384eb84c3bbea9630d805f5825320e7f9acc2ba':
kati: Handle MAKECMDGOALS modifications
diff --git a/core/ninja.mk b/core/ninja.mk
index 0fc736a..d603996 100644
--- a/core/ninja.mk
+++ b/core/ninja.mk
@@ -55,6 +55,7 @@
-include vendor/google/build/ninja_config.mk
ANDROID_TARGETS := $(filter-out $(KATI_OUTPUT_PATTERNS) $(NINJA_GOALS),$(ORIGINAL_MAKECMDGOALS))
+EXTRA_TARGETS := $(filter-out $(KATI_OUTPUT_PATTERNS) $(NINJA_GOALS),$(filter-out $(ORIGINAL_MAKECMDGOALS),$(MAKECMDGOALS)))
KATI_TARGETS := $(if $(filter $(PARSE_TIME_MAKE_GOALS),$(ANDROID_TARGETS)),$(ANDROID_TARGETS),)
define replace_space_and_slash
@@ -93,7 +94,7 @@
endif
ifeq (,$(filter generateonly,$(ORIGINAL_MAKECMDGOALS)))
-fastincremental droid $(ANDROID_TARGETS): ninja.intermediate
+fastincremental droid $(ANDROID_TARGETS) $(EXTRA_TARGETS): ninja.intermediate
@#empty
.INTERMEDIATE: ninja.intermediate
@@ -101,7 +102,7 @@
@echo Starting build with ninja
+$(hide) PATH=prebuilts/ninja/$(HOST_PREBUILT_TAG)/:$$PATH NINJA_STATUS="$(NINJA_STATUS)" $(NINJA_MAKEPARALLEL) $(KATI_NINJA_SH) -C $(TOP) $(NINJA_ARGS) $(ANDROID_TARGETS)
else
-generateonly droid $(ANDROID_TARGETS): $(KATI_OUTPUTS)
+generateonly droid $(ANDROID_TARGETS) $(EXTRA_TARGETS): $(KATI_OUTPUTS)
@#empty
endif
