lee/renderdoc
1
0 Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-10-11 06:41:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revamp android patching to only check for (& change) the debuggable flag

Browse Source 
* We don't consider anything else, this includes permissions or the
  library being present. Since we no longer expect to patch in the
  library we also don't check its version (however we leave the tag in
  case it is useful in the future).
* If the user has root access we will never warn, assuming the injection
  will work fine even without the debuggable flag.
This commit is contained in:
baldurk committed 2018-01-26 21:19:14 +00:00
1 parent a019797f88
commit cb34a2daea
11 files changed
+133 -676
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

renderdoc/android/android_utils.cpp
+7 -32
View File
@@ -58,42 +58,17 @@ void ExtractDeviceIDAndIndex(const std::string &hostname, int &index, std::strin
deviceID = c;
}
bool CheckRootAccess(const std::string &deviceID)
std::string GetPathForPackage(const std::string &deviceID, const std::string &packageName)
{
RDCLOG("Checking for root access on %s", deviceID.c_str());
std::string pkgPath = trim(adbExecCommand(deviceID, "shell pm path " + packageName).strStdout);
Process::ProcessResult result = {};
if(pkgPath.empty() || pkgPath.find("package:") != 0 || pkgPath.find("base.apk") == std::string::npos)
return pkgPath;
// Try switching adb to root and check a few indicators for success
// Nothing will fall over if we get a false positive here, it just enables
// additional methods of getting things set up.
pkgPath.erase(pkgPath.begin(), pkgPath.begin() + strlen("package:"));
pkgPath.erase(pkgPath.end() - strlen("base.apk"), pkgPath.end());
result = adbExecCommand(deviceID, "root");
std::string whoami = trim(adbExecCommand(deviceID, "shell whoami").strStdout);
if(whoami == "root")
return true;
std::string checksu =
trim(adbExecCommand(deviceID, "shell test -e /system/xbin/su && echo found").strStdout);
if(checksu == "found")
return true;
return false;
}
bool SearchForAndroidLibrary(const std::string &deviceID, const std::string &location,
const std::string &layerName, std::string &foundLayer)
{
RDCLOG("Checking for layers in: %s", location.c_str());
foundLayer =
trim(adbExecCommand(deviceID, "shell find " + location + " -name " + layerName).strStdout);
if(!foundLayer.empty())
{
RDCLOG("Found RenderDoc layer in %s", location.c_str());
return true;
}
return false;
return pkgPath;
}
std::string GetFriendlyName(std::string deviceID)