commit 77ecb3347ba2dc4e67fb38f828a1cdfdf5865a91
author Dan Willemsen <dwillemsen@google.com> Thu Nov 03 02:39:18 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 03 02:39:19 2016 +0000
tree 8b46e39dd7961ec3af4a14056a4dd2f603fb91ba
parent b1e0c2c4786d4170b46bce11d432646d311e5e01
parent d4b0504f857f4bf02a3283b773d5b976bd725271

Merge "Update combined build.ninja to depend on Soong's build.ninja"

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