Loading core/ninja.mk +3 −1 Original line number Diff line number Diff line Loading @@ -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))) Loading Loading
core/ninja.mk +3 −1 Original line number Diff line number Diff line Loading @@ -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))) Loading