aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2017-07-11 14:30:00 -0700
committerDan Willemsen <dwillemsen@google.com>2017-07-11 15:23:55 -0700
commitc40e10bd6beb2be8ecb2f1ce478b70ddc04fd328 (patch)
treed74039a78fc3e7f61f43f326ee0ec1ff1b7e52f4 /ui
parent091525e15ca573f6f8bd50be8c00e6ce93f9eed2 (diff)
downloadbuild_soong-c40e10bd6beb2be8ecb2f1ce478b70ddc04fd328.tar.gz
build_soong-c40e10bd6beb2be8ecb2f1ce478b70ddc04fd328.tar.bz2
build_soong-c40e10bd6beb2be8ecb2f1ce478b70ddc04fd328.zip
Drop make flags in soong_ui
MAKELEVEL and MAKEFLAGS were are both unset by makeparallel when invoked from Make. In preparation for removing the Make wrapper (and makeparallel), strip them in soong_ui as well. Add MFLAGS for completeness. Test: m -j Change-Id: I029f9464d11b432e979b32ede360450f4facb038
Diffstat (limited to 'ui')
-rw-r--r--ui/build/config.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/ui/build/config.go b/ui/build/config.go
index a451cfe5..ef061576 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -98,6 +98,11 @@ func NewConfig(ctx Context, args ...string) Config {
// Variables that have caused problems in the past
"DISPLAY",
"GREP_OPTIONS",
+
+ // Drop make flags
+ "MAKEFLAGS",
+ "MAKELEVEL",
+ "MFLAGS",
)
// Tell python not to spam the source tree with .pyc files.