commit 4aca5715523d1b8a85abde00d7ccc2989c90a96b
author Colin Cross <ccross@android.com> Tue Mar 29 10:47:51 2016 -0700
committer Colin Cross <ccross@android.com> Tue Mar 29 12:10:53 2016 -0700
tree 4e6cca4a67fcd177a60943ef7144d650fe84af15
parent 0f846c73e10e9505b0dae61f5ef4c083921cc348

Remove -d keepdepfile from ninja command line DO NOT MERGE

keepdepfile is not supported by the ninja prebuilt in nyc-dev.

Bug: 27886012
Change-Id: Ia4f0b15916618b1b7caa2abb53e25f87737b5288

core/ninja.mk

diff --git a/core/ninja.mk b/core/ninja.mk
index 6a424ca..8a4fd6d 100644
--- a/core/ninja.mk
+++ b/core/ninja.mk
@@ -145,7 +145,7 @@
 .PHONY: ninja_wrapper
 ninja_wrapper: $(COMBINED_BUILD_NINJA) $(MAKEPARALLEL)
 	@echo Starting build with ninja
-	+$(hide) export NINJA_STATUS="$(NINJA_STATUS)" && source $(KATI_ENV_SH) && $(NINJA_MAKEPARALLEL) $(NINJA) -d keepdepfile $(NINJA_GOALS) -C $(TOP) -f $(COMBINED_BUILD_NINJA) $(NINJA_ARGS)
+	+$(hide) export NINJA_STATUS="$(NINJA_STATUS)" && source $(KATI_ENV_SH) && $(NINJA_MAKEPARALLEL) $(NINJA) $(NINJA_GOALS) -C $(TOP) -f $(COMBINED_BUILD_NINJA) $(NINJA_ARGS)
 
 KATI_FIND_EMULATOR := --use_find_emulator
 ifeq ($(KATI_EMULATE_FIND),false)