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

Commit b4b655a7 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

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

am: 77ecb334

Change-Id: Ia9520db5e535a290d713ce87e3dcba73be7327d7
parents c70f5503 77ecb334

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