lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-23 10:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add an abstracted interface around android-specific handling

Browse Source 
* This makes it easier to use the same kind of interface to manage other kinds
  of devices.
This commit is contained in:
baldurk
2019-07-29 16:54:36 +01:00
parent 06f2e61b8f
commit e2704fa2eb
34 changed files with 2340 additions and 1492 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/android/android_patch.cpp
+9 -9
View File
@@ -513,12 +513,12 @@ bool IsDebuggable(const std::string &deviceID, const std::string &packageName)
}
};
extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_CheckAndroidPackage(
const char *hostname, const char *packageAndActivity, AndroidFlags *flags)
extern "C" RENDERDOC_API void RENDERDOC_CC
RENDERDOC_CheckAndroidPackage(const char *URL, const char *packageAndActivity, AndroidFlags *flags)
{
int index = 0;
std::string deviceID;
Android::ExtractDeviceIDAndIndex(hostname, index, deviceID);
IDeviceProtocolHandler *adb = RenderDoc::Inst().GetDeviceProtocol("adb");
rdcstr deviceID = adb->GetDeviceID(URL);
// Reset the flags each time we check
*flags = AndroidFlags::NoFlags;
@@ -542,15 +542,15 @@ extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_CheckAndroidPackage(
}
extern "C" RENDERDOC_API AndroidFlags RENDERDOC_CC RENDERDOC_MakeDebuggablePackage(
const char *hostname, const char *packageAndActivity, RENDERDOC_ProgressCallback progress)
const char *URL, const char *packageAndActivity, RENDERDOC_ProgressCallback progress)
{
std::string package = Android::GetPackageName(packageAndActivity);
Process::ProcessResult result = {};
int index = 0;
std::string deviceID;
Android::ExtractDeviceIDAndIndex(hostname, index, deviceID);
IDeviceProtocolHandler *adb = RenderDoc::Inst().GetDeviceProtocol("adb");
rdcstr deviceID = adb->GetDeviceID(URL);
// make sure progress is valid so we don't have to check it everywhere
if(!progress)