From 4aca5715523d1b8a85abde00d7ccc2989c90a96b Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 29 Mar 2016 10:47:51 -0700 Subject: [PATCH] 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/ninja.mk b/core/ninja.mk index 6a424ca22..8a4fd6dc7 100644 --- a/core/ninja.mk +++ b/core/ninja.mk @@ -145,7 +145,7 @@ $(sort $(DEFAULT_GOAL) $(ANDROID_GOALS)) : ninja_wrapper .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) -- 2.11.0