From d2f35846e4ccb422af26e183128030f1f8fc7f80 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Fri, 5 Feb 2016 00:10:20 -0800
Subject: [PATCH] makeparallel: unset MAKEFLAGS and MAKELEVEL

makeparallel inherits values for MAKEFLAGS and MAKELEVEL from make
through the environment, but they should not be propagated to the child
process in case the child process tries to run make again.

Bug: 26071246
Change-Id: I4c5df10ea8055cd1f1f61a892d5b1a7acb287bbb
(cherry picked from commit d8f0d68b78e968c5d014a9bac9463dbcf522b1c5)
---
 tools/makeparallel/makeparallel.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/makeparallel/makeparallel.cpp b/tools/makeparallel/makeparallel.cpp
index cf125faa3..3c39846ec 100644
--- a/tools/makeparallel/makeparallel.cpp
+++ b/tools/makeparallel/makeparallel.cpp
@@ -341,6 +341,8 @@ int main(int argc, char* argv[]) {
     error(errno, errno, "fork failed");
   } else if (pid == 0) {
     // child
+    unsetenv("MAKEFLAGS");
+    unsetenv("MAKELEVEL");
     int ret = execvp(path, args.data());
     if (ret < 0) {
       error(errno, errno, "exec %s failed", path);