Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4b0504f authored by Dan Willemsen's avatar Dan Willemsen
Browse files

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
parent b1e0c2c4

core/ninja.mk

+2 −1
Original line number Diff line number Diff line
@@ -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