From d4b0504f857f4bf02a3283b773d5b976bd725271 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 2 Nov 2016 16:24:52 -0700 Subject: [PATCH] Update combined build.ninja to depend on Soong's build.ninja For Soong's build.ninja regeneration to work Bug: 32574042 Test: m -j, add globbed file, m -j Change-Id: Ie267ea33e8de88275e99330b2d0f147d1e58fa7b --- core/ninja.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/ninja.mk b/core/ninja.mk index 30146d222..b865a7975 100644 --- a/core/ninja.mk +++ b/core/ninja.mk @@ -140,10 +140,11 @@ NINJA_ARGS += $(NINJA_EXTRA_ARGS) 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 -- 2.11.0