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

Pass command-line args as 'intent args' when launching apk. Refs #987

Browse Source
This commit is contained in:
baldurk
2018-05-24 21:42:29 +01:00
parent 24d8e2f18a
commit 858b02480b
7 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/android/android.cpp
+5 -5
View File
@@ -177,7 +177,7 @@ int GetCurrentPID(const std::string &deviceID, const std::string &packageName)
}
ExecuteResult StartAndroidPackageForCapture(const char *host, const char *package,
const CaptureOptions &opts)
const char *intentArgs, const CaptureOptions &opts)
{
int index = 0;
std::string deviceID;
@@ -244,8 +244,8 @@ ExecuteResult StartAndroidPackageForCapture(const char *host, const char *packag
RDCLOG("Setting up to launch the application as a debugger to inject.");
// start the activity in this package with debugging enabled and force-stop after starting
adbExecCommand(deviceID, StringFormat::Fmt("shell am start -S -D %s/%s", packageName.c_str(),
activityName.c_str()));
adbExecCommand(deviceID, StringFormat::Fmt("shell am start -S -D %s/%s %s", packageName.c_str(),
activityName.c_str(), intentArgs));
// adb shell ps | grep $PACKAGE | awk '{print $2}')
pid = GetCurrentPID(deviceID, packageName);
@@ -255,8 +255,8 @@ ExecuteResult StartAndroidPackageForCapture(const char *host, const char *packag
RDCLOG("Not doing any injection - assuming APK is pre-loaded with RenderDoc capture library.");
// start the activity in this package with debugging enabled and force-stop after starting
adbExecCommand(deviceID, StringFormat::Fmt("shell am start %s/%s", packageName.c_str(),
activityName.c_str()));
adbExecCommand(deviceID, StringFormat::Fmt("shell am start %s/%s %s", packageName.c_str(),
activityName.c_str(), intentArgs));
// don't connect JDWP
jdwpPort = 0;