From 687744cf6d04e0843fad8d3dc870d5e83e2183ce Mon Sep 17 00:00:00 2001 From: Michael Rennie Date: Tue, 13 Sep 2016 11:01:06 +0100 Subject: [PATCH 1/2] Save captures to /sdcard, so that APK can replay it immediately. --- renderdoc/os/posix/android/android_stringio.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/renderdoc/os/posix/android/android_stringio.cpp b/renderdoc/os/posix/android/android_stringio.cpp index 567f5e008..ba96f4e64 100644 --- a/renderdoc/os/posix/android/android_stringio.cpp +++ b/renderdoc/os/posix/android/android_stringio.cpp @@ -58,17 +58,12 @@ namespace FileIO { const char *GetTempRootPath() { - static string ret; - GetExecutableFilename(ret); - - // This folder is writable even if the APK does not have manifest write permissions. - ret = "/data/data/" + ret + "/files"; - return ret.c_str(); + return "/sdcard"; } string GetAppFolderFilename(const string &filename) { - return GetTempRootPath() + filename; + return GetTempRootPath() + string("/") + filename; } // For RenderDocCmd.apk, this returns "org.renderdoc.renderdoccmd" From b32bb1cc55184897fd034a99b3738a7e8f7f8466 Mon Sep 17 00:00:00 2001 From: Michael Rennie Date: Tue, 13 Sep 2016 13:00:13 +0100 Subject: [PATCH 2/2] Keep target as Android package name instead of "unknown". --- renderdoc/os/posix/posix_stringio.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/renderdoc/os/posix/posix_stringio.cpp b/renderdoc/os/posix/posix_stringio.cpp index 1715dcf28..77e07cbf2 100644 --- a/renderdoc/os/posix/posix_stringio.cpp +++ b/renderdoc/os/posix/posix_stringio.cpp @@ -141,10 +141,12 @@ void GetDefaultFiles(const char *logBaseName, string &capture_filename, string & GetExecutableFilename(path); const char *mod = strrchr(path.c_str(), '/'); - if(mod == NULL) - mod = "unknown"; - else + if(mod != NULL) mod++; + else if(path.length()) + mod = path.c_str(); // Keep Android package name i.e. org.company.app + else + mod = "unknown"; target = string(mod);