Merge "Only pass NINJA_ARGS to the main ninja compile" (374c7fac) · Commits · e / os / android_build

core/ninja.mk

+7 −3

Original line number	Diff line number	Diff line
		@@ -104,13 +104,15 @@ ifeq (,$(NINJA_STATUS))
		NINJA_STATUS := [%p %s/%t]$(space)
		endif

		NINJA_EXTRA_ARGS :=

		ifneq (,$(filter showcommands,$(ORIGINAL_MAKECMDGOALS)))
		NINJA_ARGS += "-v"
		NINJA_EXTRA_ARGS += "-v"
		endif

		# Make multiple rules to generate the same target an error instead of
		# proceeding with undefined behavior.
		NINJA_ARGS += -w dupbuild=err
		NINJA_EXTRA_ARGS += -w dupbuild=err

		ifdef USE_GOMA
		KATI_MAKEPARALLEL := $(MAKEPARALLEL)
		@@ -118,11 +120,13 @@ KATI_MAKEPARALLEL := $(MAKEPARALLEL)
		# this parallelism. Note the parallelism of all other jobs is still
		# limited by the -j flag passed to GNU make.
		NINJA_REMOTE_NUM_JOBS ?= 500
		NINJA_ARGS += -j$(NINJA_REMOTE_NUM_JOBS)
		NINJA_EXTRA_ARGS += -j$(NINJA_REMOTE_NUM_JOBS)
		else
		NINJA_MAKEPARALLEL := $(MAKEPARALLEL) --ninja
		endif

		NINJA_ARGS += $(NINJA_EXTRA_ARGS)

		ifeq ($(USE_SOONG),true)
		COMBINED_BUILD_NINJA := $(OUT_DIR)/combined$(KATI_NINJA_SUFFIX).ninja

+1 −1

Original line number	Diff line number	Diff line
		@@ -79,4 +79,4 @@ $(SOONG_IN_MAKE):
		# prebuilts.
		.PHONY: run_soong
		run_soong: $(SOONG_BOOTSTRAP) $(SOONG_VARIABLES) $(SOONG_IN_MAKE) FORCE
		$(hide) $(SOONG) $(SOONG_BUILD_NINJA) $(NINJA_ARGS)
		$(hide) $(SOONG) $(SOONG_BUILD_NINJA) $(NINJA_EXTRA_ARGS)