From 8230ad5242a763535707e363a1e1c460ef6019b2 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 19 May 2020 18:44:41 +0100 Subject: [PATCH] Fix push of settings file on android * It seems the `files` folder isn't there by default, so we don't want to write a file there instead. --- renderdoc/android/android.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/renderdoc/android/android.cpp b/renderdoc/android/android.cpp index 95c172947..0f435c92c 100644 --- a/renderdoc/android/android.cpp +++ b/renderdoc/android/android.cpp @@ -1004,7 +1004,8 @@ struct AndroidController : public IDeviceProtocolHandler // push settings file into our folder Android::adbExecCommand(deviceID, "push \"" + FileIO::GetAppFolderFilename("renderdoc.conf") + - "\" /sdcard/Android/data/" + package + "/files"); + "\" /sdcard/Android/data/" + package + + "/files/renderdoc.conf"); // launch the last ABI, as the 64-bit version where possible, or 32-bit version where not. // Captures are portable across bitness and in some cases a 64-bit capture can't replay on a @@ -1189,7 +1190,8 @@ ExecuteResult AndroidRemoteServer::ExecuteAndInject(const char *a, const char *w // try to push our settings file into the appdata folder Android::adbExecCommand(m_deviceID, "push \"" + FileIO::GetAppFolderFilename("renderdoc.conf") + - "\" /sdcard/Android/data/" + processName + "/files"); + "\" /sdcard/Android/data/" + processName + + "/files/renderdoc.conf"); rdcstr installedPath = Android::GetPathForPackage(m_deviceID, packageName);