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

Allow choosing activities for an android program. Closes #1387

Browse Source
This commit is contained in:
baldurk
2019-05-17 13:35:34 +01:00
parent e8e3972953
commit 4738844122
9 changed files with 222 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/android/android_patch.cpp
+10 -10
View File
@@ -523,9 +523,8 @@ bool IsDebuggable(const std::string &deviceID, const std::string &packageName)
}
};
extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_CheckAndroidPackage(const char *hostname,
const char *packageName,
AndroidFlags *flags)
extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_CheckAndroidPackage(
const char *hostname, const char *packageAndActivity, AndroidFlags *flags)
{
int index = 0;
std::string deviceID;
@@ -534,13 +533,13 @@ extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_CheckAndroidPackage(const c
// Reset the flags each time we check
*flags = AndroidFlags::NoFlags;
if(Android::IsDebuggable(deviceID, get_basename(std::string(packageName))))
if(Android::IsDebuggable(deviceID, Android::GetPackageName(packageAndActivity)))
{
*flags |= AndroidFlags::Debuggable;
}
else
{
RDCLOG("%s is not debuggable", packageName);
RDCLOG("%s is not debuggable", packageAndActivity);
}
if(Android::HasRootAccess(deviceID))
@@ -553,10 +552,11 @@ extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_CheckAndroidPackage(const c
}
extern "C" RENDERDOC_API AndroidFlags RENDERDOC_CC RENDERDOC_MakeDebuggablePackage(
const char *hostname, const char *packageName, RENDERDOC_ProgressCallback progress)
const char *hostname, const char *packageAndActivity, RENDERDOC_ProgressCallback progress)
{
std::string package = Android::GetPackageName(packageAndActivity);
Process::ProcessResult result = {};
std::string package(get_basename(std::string(packageName)));
int index = 0;
std::string deviceID;
@@ -629,17 +629,17 @@ extern "C" RENDERDOC_API AndroidFlags RENDERDOC_CC RENDERDOC_MakeDebuggablePacka
progress(0.525f);
if(!Android::UninstallOriginalAPK(deviceID, packageName, tmpDir))
if(!Android::UninstallOriginalAPK(deviceID, package, tmpDir))
return AndroidFlags::RepackagingAPKFailure;
progress(0.6f);
if(!Android::ReinstallPatchedAPK(deviceID, alignedAPK, abi, packageName, tmpDir))
if(!Android::ReinstallPatchedAPK(deviceID, alignedAPK, abi, package, tmpDir))
return AndroidFlags::RepackagingAPKFailure;
progress(0.95f);
if(!Android::IsDebuggable(deviceID, packageName))
if(!Android::IsDebuggable(deviceID, package))
return AndroidFlags::ManifestPatchFailure;
progress(1.0f);