commit b4b655a7afc3e03e45252885e4ff8616a210d79a
author Dan Willemsen <dwillemsen@google.com> Thu Nov 03 02:45:12 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 03 02:45:12 2016 +0000
tree 0a61e3f6940c4b3fafd03987436cf40857dbbc55
parent c70f550338d5873811a4c404016246291644cf3c
parent 77ecb3347ba2dc4e67fb38f828a1cdfdf5865a91

Merge "Update combined build.ninja to depend on Soong's build.ninja"
am: 77ecb3347b

Change-Id: Ia9520db5e535a290d713ce87e3dcba73be7327d7

core/ninja.mk

diff --git a/core/ninja.mk b/core/ninja.mk
index 30146d2..b865a79 100644
--- a/core/ninja.mk
+++ b/core/ninja.mk
@@ -140,10 +140,11 @@
 
 COMBINED_BUILD_NINJA := $(OUT_DIR)/combined$(KATI_NINJA_SUFFIX).ninja
 
-$(COMBINED_BUILD_NINJA): $(KATI_BUILD_NINJA)
+$(COMBINED_BUILD_NINJA): $(KATI_BUILD_NINJA) FORCE
 	$(hide) echo "builddir = $(OUT_DIR)" > $(COMBINED_BUILD_NINJA)
 	$(hide) echo "include $(KATI_BUILD_NINJA)" >> $(COMBINED_BUILD_NINJA)
 	$(hide) echo "include $(SOONG_BUILD_NINJA)" >> $(COMBINED_BUILD_NINJA)
+	$(hide) echo "build $(COMBINED_BUILD_NINJA): phony $(SOONG_BUILD_NINJA)" >> $(COMBINED_BUILD_NINJA)
 
 $(sort $(DEFAULT_GOAL) $(ANDROID_GOALS)) : ninja_wrapper
 	@#empty