lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-07-31 20:01:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added Scoped Storage Support for Android

Browse Source 
Updated permissions for the renderdoccmd app based on which version of
android the app is running on
**WRITE_EXTERNAL_STORAGE for <R
**MANAGE_EXTERNAL_STORAGE for >=R

Updated the Java portion of renderdoccmd to check/request the correct
permission based on android version

Changed the file path for renderdoc files on Android based on the
version of Android the connected device is running
**/sdcard/Android/data/$PACKAGE_NAME for <R
**/sdcard/Android/media/$PACKAGE_NAME for >=R
This commit is contained in:
Omar El Sheikh
2020-07-09 14:29:41 +01:00
committed by Baldur Karlsson
parent efafd0b766
commit c15078b900
6 changed files with 63 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/android/android.cpp
+6 -4
View File
@@ -1218,6 +1218,8 @@ ExecuteResult AndroidRemoteServer::ExecuteAndInject(const char *a, const char *w
"shell setprop debug.vulkan.layers " RENDERDOC_VULKAN_LAYER_NAME);
}
rdcstr folderName = Android::GetFolderName(m_deviceID);
// if in VR mode, enable frame delimiter markers
Android::adbExecCommand(m_deviceID, "shell setprop debug.vr.profiler 1");
@@ -1228,9 +1230,9 @@ ExecuteResult AndroidRemoteServer::ExecuteAndInject(const char *a, const char *w
// Android/data/<package>
// has the permissions set correctly, and we don't have a convenient way to get the package name
// from native code.
Android::adbExecCommand(m_deviceID, "shell mkdir -p /sdcard/Android/data/" + processName);
Android::adbExecCommand(m_deviceID,
"shell mkdir -p /sdcard/Android/data/" + processName + "/files");
Android::adbExecCommand(m_deviceID, "shell mkdir -p /sdcard/Android/" + folderName + processName);
Android::adbExecCommand(
m_deviceID, "shell mkdir -p /sdcard/Android/" + folderName + processName + "/files");
// set our property with the capture options encoded, to be picked up by the library on the
// device
Android::adbExecCommand(m_deviceID,
@@ -1239,7 +1241,7 @@ 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 +
"\" /sdcard/Android/" + folderName + processName +
"/files/renderdoc.conf");
rdcstr installedPath = Android::GetPathForPackage(m_deviceID, packageName);