Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b384eb84 authored by Dan Willemsen's avatar Dan Willemsen Committed by Gerrit Code Review
Browse files

Merge "kati: Handle MAKECMDGOALS modifications"

parents 4ce3cea7 cb1bd116

core/ninja.mk

+3 −2
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ PARSE_TIME_MAKE_GOALS := \ 
-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 @@ NINJA_MAKEPARALLEL := $(MAKEPARALLEL) 
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 @@ ninja.intermediate: $(KATI_OUTPUTS) $(MAKEPARALLEL) 
	@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