Update android.toolchain.cmake to upstream commit fd1f7055f8b7338644d58d9a2015a784dfa...

[apitrace] / cli / cli_trace.cpp

diff --git a/cli/cli_trace.cpp b/cli/cli_trace.cpp
index f87a383b009cd0c13e29754144b63b13ad16cbfb..52843c70703564af811410553a3cfc95dd278fb5 100644 (file)
--- a/cli/cli_trace.cpp
+++ b/cli/cli_trace.cpp
@@ -126,9 +126,9 @@ traceProgram(trace::API api,
         return 1;
     }
 
-    os::String wrapperPath = findWrapper(wrapperFilename);
+    os::String wrapperPath = findWrapper(wrapperFilename, verbose);
     if (!wrapperPath.length()) {
-        std::cerr << "error: failed to find " << wrapperFilename << "\n";
+        std::cerr << "error: failed to find " << wrapperFilename << " wrapper\n";
         goto exit;
     }
 
@@ -169,7 +169,6 @@ traceProgram(trace::API api,
     for (char * const * arg = argv; *arg; ++arg) {
         args.push_back(*arg);
     }
-    args.push_back(NULL);
 
     if (verbose) {
         const char *sep = "";
@@ -180,6 +179,8 @@ traceProgram(trace::API api,
         std::cerr << "\n";
     }
 
+    args.push_back(NULL);
+
     status = os::execute((char * const *)&args[0]);
 
 exit: