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

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

Merge "Prevent Kati from seeing MAKEFLAGS" am: 6b363e24 am: 01784e0a

am: 27766efe

Change-Id: I05282a22526f1f871dccfe9e1689aaa77603cd96
parents 4dc66408 27766efe
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -123,6 +123,14 @@ NINJA_REMOTE_NUM_JOBS ?= 500
NINJA_EXTRA_ARGS += -j$(NINJA_REMOTE_NUM_JOBS)
else
NINJA_MAKEPARALLEL := $(MAKEPARALLEL) --ninja

# We never want Kati to see MAKEFLAGS, as forcefully overriding variables is
# terrible. The variables in MAKEFLAGS are still available in the environment,
# so if part of the build wants input from the user, it should be explicitly
# checking for an environment variable or using ?=
#
# makeparallel already clears MAKEFLAGS, so it's not necessary in the GOMA case
KATI_MAKEPARALLEL := MAKEFLAGS=
endif

NINJA_ARGS += $(NINJA_EXTRA_ARGS)