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

* 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
+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]);