From 0c3b9d8a8c1621c4e523f47e5ca09fcba7e543b5 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 17 Dec 2019 10:46:29 +0000 Subject: [PATCH] Fix default expected location of local android builds --- renderdoc/android/android.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/renderdoc/android/android.cpp b/renderdoc/android/android.cpp index 79d82c802..a35cfc433 100644 --- a/renderdoc/android/android.cpp +++ b/renderdoc/android/android.cpp @@ -272,13 +272,13 @@ ReplayStatus InstallRenderDocServer(const rdcstr &deviceID) rdcstr suff = GetPlainABIName(abis[0]); - paths.push_back(libDir + "/plugins/android/"); // Windows install - paths.push_back(libDir + "/../share/renderdoc/plugins/android/"); // Linux install - paths.push_back(libDir + "/../plugins/android/"); // macOS install - paths.push_back(libDir + "/../../build-android/bin/"); // Local build - paths.push_back(libDir + "/../../build-android" + suff + "/bin/"); // Local ABI build - paths.push_back(libDir + "/../../../../../build-android/bin/"); // macOS build - paths.push_back(libDir + "/../../../../../build-android" + suff + "/bin/"); // macOS ABI build + paths.push_back(libDir + "/plugins/android/"); // Windows install + paths.push_back(libDir + "/../share/renderdoc/plugins/android/"); // Linux install + paths.push_back(libDir + "/../plugins/android/"); // macOS install + paths.push_back(libDir + "/../../build-android/bin/"); // Local build + paths.push_back(libDir + "/../../build-android-" + suff + "/bin/"); // Local ABI build + paths.push_back(libDir + "/../../../../../build-android/bin/"); // macOS build + paths.push_back(libDir + "/../../../../../build-android-" + suff + "/bin/"); // macOS ABI build // use the first ABI for searching rdcstr apk = GetRenderDocPackageForABI(abis[0]);