commit 69a4592aa50e9b6d675af83b6b2392796803395a
author Dan Willemsen <dwillemsen@google.com> Tue Feb 16 21:23:36 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 16 21:23:36 2016 +0000
tree 3548c28cf6948285873c390594dc5bfa592893df
parent 03f0a038578ca86e93408bdc7c00e5ac8f1a3578
parent c6e194ffadc2b2c83daed3011d6afa1764244499

Merge "Define a class for renderscript bitcode files"

core/tasks/check_boot_jars/package_whitelist.txt

diff --git a/core/tasks/check_boot_jars/package_whitelist.txt b/core/tasks/check_boot_jars/package_whitelist.txt
index 48fa4a1..3a1ca23 100644
--- a/core/tasks/check_boot_jars/package_whitelist.txt
+++ b/core/tasks/check_boot_jars/package_whitelist.txt
@@ -32,6 +32,7 @@
 java\.util\.concurrent
 java\.util\.concurrent\.atomic
 java\.util\.concurrent\.locks
+java\.util\.function
 java\.util\.jar
 java\.util\.logging
 java\.util\.prefs

tools/makeparallel/makeparallel.cpp

diff --git a/tools/makeparallel/makeparallel.cpp b/tools/makeparallel/makeparallel.cpp
index cf125fa..3c39846 100644
--- a/tools/makeparallel/makeparallel.cpp
+++ b/tools/makeparallel/makeparallel.cpp
@@ -341,6 +341,8 @@
     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);