lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-07-22 15:31:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add error messages if RenderDoc app fails to install

Browse Source
This commit is contained in:
Baldur Karlsson
2018-03-12 15:46:44 +00:00
parent dd1d7bd2ba
commit 103618c2eb
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/android/android.cpp
+13 -4
View File
@@ -263,7 +263,10 @@ bool InstallRenderDocServer(const std::string &deviceID)
std::vector<ABI> abis = GetSupportedABIs(deviceID);
if(abis.empty())
{
RDCERR("Couldn't determine supported ABIs for %s", deviceID.c_str());
return false;
}
// Check known paths for RenderDoc server
std::string exePath;
@@ -330,13 +333,16 @@ bool InstallRenderDocServer(const std::string &deviceID)
}
// Ensure installation succeeded. We should have as many lines as abis we installed
std::string adbCheck =
adbExecCommand(deviceID, "shell pm list packages " RENDERDOC_ANDROID_PACKAGE_BASE).strStdout;
Process::ProcessResult adbCheck =
adbExecCommand(deviceID, "shell pm list packages " RENDERDOC_ANDROID_PACKAGE_BASE);
if(adbCheck.empty())
if(adbCheck.strStdout.empty())
{
RDCERR("Couldn't find any installed APKs. stderr: %s", adbCheck.strStderror.c_str());
return false;
}
size_t lines = adbCheck.find('\n') == std::string::npos ? 1 : 2;
size_t lines = adbCheck.strStdout.find('\n') == std::string::npos ? 1 : 2;
if(lines != abis.size())
RDCWARN("Installation of some apks failed!");
@@ -515,7 +521,10 @@ extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_StartAndroidRemoteServer(co
{
// If server is not detected or has been removed due to incompatibility, install it
if(!Android::InstallRenderDocServer(deviceID))
{
RDCERR("Failed to install RenderDoc server app");
return;
}
}
// stop all servers of any ABI