From c40e10bd6beb2be8ecb2f1ce478b70ddc04fd328 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 11 Jul 2017 14:30:00 -0700 Subject: [PATCH] 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 --- ui/build/config.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ui/build/config.go b/ui/build/config.go index a451cfe5f..ef0615768 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.