commit 218a0c0c70d70c09e1bcc57f535a2a3353aa2835
author Treehugger Robot <treehugger-gerrit@google.com> Sat Jul 29 08:11:32 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jul 29 08:11:32 2017 +0000
tree 2a55f6d19411dc7ceefa5c23157903f8e4066001
parent dce396a70f230773bfec7edd0471d91c2814fdd9
parent e9842248993762d8456a37fef97ff8684bb3c9e4

Merge "Continue using the real make if -C is used"

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index dca817a..ae65832 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1542,6 +1542,13 @@
 {
     # If we're in the top of an Android tree, use soong_ui.bash instead of make
     if [ -f build/soong/soong_ui.bash ]; then
+        # Always use the real make if -C is passed in
+        for arg in "$@"; do
+            if [[ $arg == -C* ]]; then
+                echo command make
+                return
+            fi
+        done
         echo build/soong/soong_ui.bash --make-mode
     else
         echo command make
@@ -1588,7 +1595,7 @@
 
 function make()
 {
-    _wrap_build $(get_make_command) "$@"
+    _wrap_build $(get_make_command "$@") "$@"
 }
 
 function provision()