commit a6f510c776bc1af95ffb261add2ff4d6dbc29a9c
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jun 15 22:41:32 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 15 22:41:32 2016 +0000
tree 3fc9fc9b73cfe168f164901830c3e05b1fd5ee36
parent 7fba3347b9f9fa67b5be654b45c4af91ceac3f70
parent 3773b45c3b5d28704fe0cb2d4fc2c146cc2f41f3

Merge "Fix kati --no_ignore_dirty usage"

core/ninja.mk

diff --git a/core/ninja.mk b/core/ninja.mk
index bbd5863..62102ba 100644
--- a/core/ninja.mk
+++ b/core/ninja.mk
@@ -155,7 +155,7 @@
 endif
 $(KATI_BUILD_NINJA): $(CKATI) $(MAKEPARALLEL) $(DUMMY_OUT_MKS) run_soong FORCE
 	@echo Running kati to generate build$(KATI_NINJA_SUFFIX).ninja...
-	+$(hide) $(KATI_MAKEPARALLEL) $(CKATI) --ninja --ninja_dir=$(OUT_DIR) --ninja_suffix=$(KATI_NINJA_SUFFIX) --regen --ignore_dirty=$(OUT_DIR)/% --no_ignore_dirty=$(SOONG_ANDROID_MK) --no_ignore_dirty=$(SOONG_MAKEVARS_MK) --ignore_optional_include=$(OUT_DIR)/%.P --detect_android_echo $(KATI_FIND_EMULATOR) -f build/core/main.mk $(KATI_GOALS) --gen_all_targets BUILDING_WITH_NINJA=true SOONG_ANDROID_MK=$(SOONG_ANDROID_MK) SOONG_MAKEVARS_MK=$(SOONG_MAKEVARS_MK)
+	+$(hide) $(KATI_MAKEPARALLEL) $(CKATI) --ninja --ninja_dir=$(OUT_DIR) --ninja_suffix=$(KATI_NINJA_SUFFIX) --regen --ignore_dirty=$(OUT_DIR)/% --no_ignore_dirty=$(SOONG_OUT_DIR)/%.mk --ignore_optional_include=$(OUT_DIR)/%.P --detect_android_echo $(KATI_FIND_EMULATOR) -f build/core/main.mk $(KATI_GOALS) --gen_all_targets BUILDING_WITH_NINJA=true SOONG_ANDROID_MK=$(SOONG_ANDROID_MK) SOONG_MAKEVARS_MK=$(SOONG_MAKEVARS_MK)
 
 .PHONY: FORCE
 FORCE: