Merge "Continue using the real make if -C is used" am: 218a0c0c70

am: 56a2bb9ec9

Change-Id: Idd579c83cc58ed2ead8d327d3f6afaaf710c9a1e

envsetup.sh

@@ -1544,6 +1544,13 @@ function get_make_command()
 {
     # 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
@@ -1590,7 +1597,7 @@ function _wrap_build()
 
 function make()
 {
-    _wrap_build $(get_make_command) "$@"
+    _wrap_build $(get_make_command "$@") "$@"
 }
 
 function provision()