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

Commit 02d04b4d authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Pass all goals to kati when "dist" is in goals"

parents 506857e9 d3701e9e
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -54,7 +54,9 @@ PARSE_TIME_MAKE_GOALS := \

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 := $(filter $(PARSE_TIME_MAKE_GOALS),$(ANDROID_TARGETS))
# The target "dist" changes its behavior depending whether other
# targets are specified or not. See distdir.mk for detail.
KATI_TARGETS := $(if $(filter dist,$(ANDROID_TARGETS)),$(ANDROID_TARGETS),$(filter $(PARSE_TIME_MAKE_GOALS),$(ANDROID_TARGETS)))

define replace_space_and_slash
$(subst /,_,$(subst $(space),_,$(sort $1)))