From cb31f040e304e7d7b2a08d3fd8eceb72c878c37e Mon Sep 17 00:00:00 2001 From: Shinichiro Hamaji Date: Thu, 24 Sep 2015 14:33:27 +0900 Subject: [PATCH] Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS Only goals that modify the parsing need to be passed to kati, filter out everything else and only pass it to ninja. Also, always specify --gen_all_phony_targets. With this flag, kati emits all phony targets in the ninja file so a ninja file generated only with PARSE_TIME_MAKE_GOALS can handle targets which don't change the parsing. Bug: 24339367 Change-Id: I63237160c3c86817b53635665d56906790ec4e6a --- core/ninja.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/ninja.mk b/core/ninja.mk index ee72087983..5c856015c0 100644 --- a/core/ninja.mk +++ b/core/ninja.mk @@ -56,7 +56,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))) -KATI_TARGETS := $(if $(filter $(PARSE_TIME_MAKE_GOALS),$(ANDROID_TARGETS)),$(ANDROID_TARGETS),) +KATI_TARGETS := $(filter $(PARSE_TIME_MAKE_GOALS),$(ANDROID_TARGETS)) define replace_space_and_slash $(subst /,_,$(subst $(space),_,$(sort $1))) @@ -138,7 +138,7 @@ $(KATI_OUTPUTS): kati.intermediate $(KATI_FORCE) .INTERMEDIATE: kati.intermediate kati.intermediate: $(KATI) $(MAKEPARALLEL) @echo Running kati to generate build$(KATI_NINJA_SUFFIX).ninja... - +$(hide) $(KATI_MAKEPARALLEL) $(KATI) --ninja --ninja_dir=$(PRODUCT_OUT) --ninja_suffix=$(KATI_NINJA_SUFFIX) --regen --ignore_dirty=$(OUT_DIR)/% --ignore_optional_include=$(OUT_DIR)/%.P --detect_android_echo --use_find_emulator -f build/core/main.mk $(or $(KATI_TARGETS),--gen_all_phony_targets) USE_NINJA=false + +$(hide) $(KATI_MAKEPARALLEL) $(KATI) --ninja --ninja_dir=$(PRODUCT_OUT) --ninja_suffix=$(KATI_NINJA_SUFFIX) --regen --ignore_dirty=$(OUT_DIR)/% --ignore_optional_include=$(OUT_DIR)/%.P --detect_android_echo --use_find_emulator -f build/core/main.mk $(KATI_TARGETS) --gen_all_phony_targets USE_NINJA=false KATI_CXX := $(CLANG_CXX) $(CLANG_HOST_GLOBAL_CFLAGS) $(CLANG_HOST_GLOBAL_CPPFLAGS) KATI_LD := $(CLANG_CXX) $(CLANG_HOST_GLOBAL_LDFLAGS)