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

Commit cb1bd116 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

kati: Handle MAKECMDGOALS modifications 

For some special targets (PRODUCT-%), the MAKECMDGOALS variable is
modified. Before this change, using one would result in a "no rule to
make target" error, since the new target was not stubbed out.

Change-Id: I879642a48b84a66789d4bdb7db1b6fd1130819b7
parent da196abf

core/ninja.mk

+3 −2
Original line number Diff line number Diff line
@@ -54,6 +54,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
@@ -86,7 +87,7 @@ showcommands: droid 
endif



ifeq (,$(filter generateonly,$(ORIGINAL_MAKECMDGOALS)))

fastincremental droid $(ANDROID_TARGETS): ninja.intermediate

fastincremental droid $(ANDROID_TARGETS) $(EXTRA_TARGETS): ninja.intermediate

	@#empty



.INTERMEDIATE: ninja.intermediate
@@ -94,7 +95,7 @@ ninja.intermediate: $(KATI_OUTPUTS) 
	@echo Starting build with ninja

	$(hide) PATH=prebuilts/ninja/$(HOST_PREBUILT_TAG)/:$$PATH NINJA_STATUS="$(NINJA_STATUS)" $(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