lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-14 09:45:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move android support files into /plugins/android/ in the build

Browse Source 
* We also don't copy out of the android SDK anymore as that has a
  licensing impact. Instead we ship our own builds from a local AOSP
  checkout, the same way as other plugins.
This commit is contained in:
baldurk
2018-02-01 20:21:50 +00:00
parent 2dd9531199
commit 84ea588036
3 changed files with 19 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/android/android.cpp
+4 -4
View File
@@ -282,10 +282,10 @@ bool InstallRenderDocServer(const std::string &deviceID)
paths.push_back(customPath);
#endif
paths.push_back(exeDir + "/android/apk/"); // Windows install
paths.push_back(exeDir + "/../share/renderdoc/android/apk/"); // Linux install
paths.push_back(exeDir + "/../../build-android/bin/"); // Local build
paths.push_back(exeDir + "/../../../../../build-android/bin/"); // macOS build
paths.push_back(exeDir + "/plugins/android/"); // Windows install
paths.push_back(exeDir + "/../share/renderdoc/plugins/android/"); // Linux install
paths.push_back(exeDir + "/../../build-android/bin/"); // Local build
paths.push_back(exeDir + "/../../../../../build-android/bin/"); // macOS build
// use the first ABI for searching
std::string apk = GetRenderDocPackageForABI(abis[0]);
renderdoc/android/android_tools.cpp
+1 -1
View File
@@ -193,7 +193,7 @@ std::string getToolPath(ToolDir subdir, const std::string &toolname, bool checkE
FileIO::GetExecutableFilename(exepath);
std::string exedir = dirname(FileIO::GetFullPathname(exepath));
toolpath = exedir + "/android/" + toolname;
toolpath = exedir + "/plugins/android/" + toolname;
if(toolExists(toolpath))
return toolpath;
}