From 255f8cd34e4a89e4ff7a849d97c886dad265b937 Mon Sep 17 00:00:00 2001
From: Michael Rennie <m.rennie@partner.samsung.com>
Date: Thu, 18 Aug 2016 13:24:44 +0100
Subject: [PATCH] Changed AppFolderFilename on Android to fix SaveShaderCache.

---
 renderdoc/os/posix/android/android_stringio.cpp |  5 +++++
 renderdoc/os/posix/linux/linux_stringio.cpp     | 12 ++++++++++++
 renderdoc/os/posix/posix_stringio.cpp           | 12 ------------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/renderdoc/os/posix/android/android_stringio.cpp b/renderdoc/os/posix/android/android_stringio.cpp
index eb59e74c8..1dc39ce9a 100644
--- a/renderdoc/os/posix/android/android_stringio.cpp
+++ b/renderdoc/os/posix/android/android_stringio.cpp
@@ -72,6 +72,11 @@ const char *GetTempRootPath()
   return ret.c_str();
 }
 
+string GetAppFolderFilename(const string &filename)
+{
+  return GetTempRootPath() + filename;
+}
+
 // For RenderDocCmd.apk, this returns "org.renderdoc.renderdoccmd"
 // For other APKs, we use it to get the writable temp directory.
 void GetExecutableFilename(string &selfName)
diff --git a/renderdoc/os/posix/linux/linux_stringio.cpp b/renderdoc/os/posix/linux/linux_stringio.cpp
index f344c3590..03a3a04fc 100644
--- a/renderdoc/os/posix/linux/linux_stringio.cpp
+++ b/renderdoc/os/posix/linux/linux_stringio.cpp
@@ -222,6 +222,18 @@ const char *GetTempRootPath()
   return "/tmp";
 }
 
+string GetAppFolderFilename(const string &filename)
+{
+  passwd *pw = getpwuid(getuid());
+  const char *homedir = pw->pw_dir;
+
+  string ret = string(homedir) + "/.renderdoc/";
+
+  mkdir(ret.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
+
+  return ret + filename;
+}
+
 void GetExecutableFilename(string &selfName)
 {
   char path[512] = {0};
diff --git a/renderdoc/os/posix/posix_stringio.cpp b/renderdoc/os/posix/posix_stringio.cpp
index 63e0ffad9..268246a41 100644
--- a/renderdoc/os/posix/posix_stringio.cpp
+++ b/renderdoc/os/posix/posix_stringio.cpp
@@ -46,18 +46,6 @@ namespace FileIO
 // in posix/.../..._stringio.cpp
 const char *GetTempRootPath();
 
-string GetAppFolderFilename(const string &filename)
-{
-  passwd *pw = getpwuid(getuid());
-  const char *homedir = pw->pw_dir;
-
-  string ret = string(homedir) + "/.renderdoc/";
-
-  mkdir(ret.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
-
-  return ret + filename;
-}
-
 void CreateParentDirectory(const string &filename)
 {
   string fn = dirname(filename);