From d3701e9e967a7e1e97aa365af4c0080d3bad929e Mon Sep 17 00:00:00 2001 From: Shinichiro Hamaji Date: Tue, 29 Sep 2015 15:50:28 +0900 Subject: [PATCH] Pass all goals to kati when "dist" is in goals Bug: 24339367 Change-Id: Iee80d65fe169ec005900a96446aa7a432fc68872 --- core/ninja.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/ninja.mk b/core/ninja.mk index 9187f23c1..3260e9620 100644 --- a/core/ninja.mk +++ b/core/ninja.mk @@ -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))) -- 2.11.0