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

De-prioritise our bundled android tools unless there's no other option

Browse Source 
* This prevents our adb from fighting a system adb if it's used outside
  of renderdoc.
This commit is contained in:
baldurk
2018-02-02 18:40:29 +00:00
parent 66198cf200
commit bbb4fed8e1
1 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/android/android_tools.cpp
+24 -15
View File
@@ -157,12 +157,15 @@ std::string getToolPath(ToolDir subdir, const std::string &toolname, bool checkE
// search path for tools:
// 1. First look relative to the configured paths, these come from the user manually setting them
// so they always have priority.
// 2. Next if those paths don't exist or the tool isn't found, we search relative to our
// executable looking for an android/ subfolder, and look for the tool in there.
// 3. If we still don't have that (most likely because it's a local build from a git clone and not
// a distributed build with the tools available) then we fall back to trying to auto-locate it.
// 2. Next we try to auto-locate it.
// - First check if the tool is in the path, assuming the user configured it to their system.
// - Otherwise check environment variables or default locations
// 3. Finally if those paths don't exist or the tool isn't found, we search relative to our
// executable looking for an android/ subfolder, and look for the tool in there.
//
// The main reason we check our bundled folder last is because adb requires a *precise* match in
// its client-server setup, so if we run our bundled adb that might be newer than the user's, they
// will then get fighting back and forth when trying to run their own.
std::string sdk = RenderDoc::Inst().GetConfigSetting("androidSDKPath");
std::string jdk = RenderDoc::Inst().GetConfigSetting("androidJDKPath");
@@ -187,17 +190,6 @@ std::string getToolPath(ToolDir subdir, const std::string &toolname, bool checkE
if(toolExists(toolpath))
return toolpath;
// next try to locate it in our own distributed android subfolder
{
std::string exepath;
FileIO::GetExecutableFilename(exepath);
std::string exedir = dirname(FileIO::GetFullPathname(exepath));
toolpath = exedir + "/plugins/android/" + toolname;
if(toolExists(toolpath))
return toolpath;
}
// need to try to auto-guess the tool's location
// first try in PATH
@@ -241,6 +233,12 @@ std::string getToolPath(ToolDir subdir, const std::string &toolname, bool checkE
sdk = env ? env : "";
}
if(sdk.empty() || !FileIO::exists(sdk.c_str()))
{
env = Process::GetEnvVariable("ANDROID_SDK_HOME");
sdk = env ? env : "";
}
// maybe in future we can try to search in common install locations.
toolpath = getToolInSDK(subdir, jdk, sdk, toolname);
@@ -248,6 +246,17 @@ std::string getToolPath(ToolDir subdir, const std::string &toolname, bool checkE
if(toolExists(toolpath))
return toolpath;
// finally try to locate it in our own distributed android subfolder
{
std::string exepath;
FileIO::GetExecutableFilename(exepath);
std::string exedir = dirname(FileIO::GetFullPathname(exepath));
toolpath = exedir + "/plugins/android/" + toolname;
if(toolExists(toolpath))
return toolpath;
}
toolpath = "";
// if we're checking for existence, we have failed so return empty string.