lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-07-26 01:11:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make adb devices execute silently because otherwise it spams the log

Browse Source
This commit is contained in:
baldurk
2018-02-07 14:20:00 +00:00
parent fd344b2803
commit 0c89fac9b5
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/android/android_tools.cpp
+8 -6
View File
@@ -267,25 +267,27 @@ std::string getToolPath(ToolDir subdir, const std::string &toolname, bool checkE
return toolname;
}
Process::ProcessResult execScript(const std::string &script, const std::string &args,
const std::string &workDir)
const std::string &workDir, bool silent)
{
RDCLOG("SCRIPT: %s", script.c_str());
if(!silent)
RDCLOG("SCRIPT: %s", script.c_str());
Process::ProcessResult result;
Process::LaunchScript(script.c_str(), workDir.c_str(), args.c_str(), true, &result);
return result;
}
Process::ProcessResult execCommand(const std::string &exe, const std::string &args,
const std::string &workDir)
const std::string &workDir, bool silent)
{
RDCLOG("COMMAND: %s '%s'", exe.c_str(), args.c_str());
if(!silent)
RDCLOG("COMMAND: %s '%s'", exe.c_str(), args.c_str());
Process::ProcessResult result;
Process::LaunchProcess(exe.c_str(), workDir.c_str(), args.c_str(), true, &result);
return result;
}
Process::ProcessResult adbExecCommand(const std::string &device, const std::string &args,
const std::string &workDir)
const std::string &workDir, bool silent)
{
std::string adb = getToolPath(ToolDir::PlatformTools, "adb", false);
Process::ProcessResult result;
@@ -294,6 +296,6 @@ Process::ProcessResult adbExecCommand(const std::string &device, const std::stri
deviceArgs = args;
else
deviceArgs = StringFormat::Fmt("-s %s %s", device.c_str(), args.c_str());
return execCommand(adb, deviceArgs, workDir);
return execCommand(adb, deviceArgs, workDir, silent);
}
};