From 5ff665d4075bfb0506cb9f4b1e4dc27823e20450 Mon Sep 17 00:00:00 2001 From: Shinichiro Hamaji Date: Fri, 25 Sep 2015 14:20:42 +0900 Subject: [PATCH] Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS" This reverts commit cb31f040e304e7d7b2a08d3fd8eceb72c878c37e. This could be the cause of an internal build breakage. Change-Id: Ic5d2a2ce1f2d214a8201db5c570682d8336763b9 --- core/ninja.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/ninja.mk b/core/ninja.mk index 5c856015c..ee7208798 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 := $(filter $(PARSE_TIME_MAKE_GOALS),$(ANDROID_TARGETS)) +KATI_TARGETS := $(if $(filter $(PARSE_TIME_MAKE_GOALS),$(ANDROID_TARGETS)),$(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 $(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 $(or $(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)