commit 2fb7b61a2e2457b85ff1a56e36a8cb6f99db3e26
author Shinichiro Hamaji <hamaji@google.com> Thu Mar 03 18:12:52 2016 +0900
committer Colin Cross <ccross@android.com> Tue Mar 29 12:10:03 2016 -0700
tree c7bf866051081855c40c39375848403d6a68252a
parent f9d685008d573bc34b247e586ff45588a2fdb808

Use KATI_DEPFILE for .P associated with object files

Also specify "-d keepdepfile" to ninja so .P files won't be
deleted by ninja.

-include for .s files are removed because GCC doesn't
generate .d files for .s files.

Bug: 26839129
Bug: 27886012
Change-Id: If00e93c7a33449ec314a5cdba438475a32979f4e
(cherry picked from commit 4037c4225a484130a5510671e788794d23204262)

core/ninja.mk

diff --git a/core/ninja.mk b/core/ninja.mk
index 8a4fd6d..6a424ca 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) $(NINJA_GOALS) -C $(TOP) -f $(COMBINED_BUILD_NINJA) $(NINJA_ARGS)
+	+$(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)
 
 KATI_FIND_EMULATOR := --use_find_emulator
 ifeq ($(KATI_EMULATE_FIND),false)