From 17cc3002cc46f91facadb81434aaab42cbaecdc8 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 8 Jun 2021 13:07:31 +0100 Subject: [PATCH] Fix config push to android for new android versions * The config folder changed in some android version, so we need to use the right one. --- renderdoc/android/android.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/renderdoc/android/android.cpp b/renderdoc/android/android.cpp index b72d17404..bca9cb0b9 100644 --- a/renderdoc/android/android.cpp +++ b/renderdoc/android/android.cpp @@ -1045,9 +1045,11 @@ struct AndroidController : public IDeviceProtocolHandler rdcstr package = GetRenderDocPackageForABI(abis.back()); + rdcstr folderName = Android::GetFolderName(deviceID); + // push settings file into our folder Android::adbExecCommand(deviceID, "push \"" + FileIO::GetAppFolderFilename("renderdoc.conf") + - "\" /sdcard/Android/data/" + package + + "\" /sdcard/Android/" + folderName + package + "/files/renderdoc.conf"); // launch the last ABI, as the 64-bit version where possible, or 32-bit version where not.