From 52b697a488551bb7a051d5f92f0aa8616df3cfcc Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 29 Sep 2015 13:20:47 -0700 Subject: [PATCH] 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 d3701e9e967a7e1e97aa365af4c0080d3bad929e. Change-Id: Iaea1f158dbd1d4b9035954efef40b33485e6c6b3 --- core/ninja.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/ninja.mk b/core/ninja.mk index 22f3e1bf5..f593b7514 100644 --- a/core/ninja.mk +++ b/core/ninja.mk @@ -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))) -- 2.11.0