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

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

Merge "Only pass NINJA_ARGS to the main ninja compile" 

am: 374c7fac

* commit '374c7fac':
  Only pass NINJA_ARGS to the main ninja compile

Change-Id: I98f588bf7d9c39bf2a9ac7c07bfb15f19299694d
parents b0c9166c 374c7fac

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

core/soong.mk

+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)