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

Commit 52b697a4 authored by Colin Cross's avatar Colin Cross
Browse files

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

This isn't actually necessary, dist doesn't use MAKEDISTGOALS other than
to check if it contains any other real targets.  The real issue is
caused by --gen_all_targets, and is broader than just "dist".

This reverts commit d3701e9e.

Change-Id: Iaea1f158dbd1d4b9035954efef40b33485e6c6b3
parent 7e9b4ec4

core/ninja.mk

+1 −3
Original line number Diff line number Diff line
@@ -54,9 +54,7 @@ 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)))

# 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)))

KATI_TARGETS := $(filter $(PARSE_TIME_MAKE_GOALS),$(ANDROID_TARGETS))



define replace_space_and_slash

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