lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-12 13:00:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation of disabled custom APK location codepath

Browse Source
This commit is contained in:
baldurk
2020-01-07 13:34:55 +00:00
parent 46a70a6c5f
commit 9950d8dbf3
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/android/android.cpp
+16 -10
View File
@@ -258,18 +258,24 @@ ReplayStatus InstallRenderDocServer(const rdcstr &deviceID)
rdcarray<rdcstr> paths;
#if defined(RENDERDOC_APK_PATH)
string customPath(RENDERDOC_APK_PATH);
RDCLOG("Custom APK path: %s", customPath.c_str());
if(FileIO::IsRelativePath(customPath))
customPath = libDir + "/" + customPath;
if(customPath.back() != '/'))
customPath += '/';
paths.push_back(customPath);
rdcstr customPath(RENDERDOC_APK_PATH);
#else
rdcstr customPath;
#endif
if(!customPath.empty())
{
RDCLOG("Custom APK path: %s", customPath.c_str());
if(FileIO::IsRelativePath(customPath))
customPath = libDir + "/" + customPath;
if(customPath.back() != '/')
customPath += '/';
paths.push_back(customPath);
}
rdcstr suff = GetPlainABIName(abis[0]);
paths.push_back(libDir + "/plugins/android/"); // Windows install