diff options
| author |  brianosman <brianosman@google.com> | 2016-06-08 13:07:08 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-06-08 13:07:08 -0700 |
| commit | 28215d44b3f9d100ba4420df43adb72cdff7d2b3 (patch) | |
| tree | 36fa58113558d13c6765d17afeacf0d96b562155 /platform_tools | |
| parent | e9906e71fbc29968ea10680f0fcd53a4153c7568 (diff) | |
Support running Viewer via android_gdb_app
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2055453003
Review-Url: https://codereview.chromium.org/2055453003
Diffstat (limited to 'platform_tools')
| -rwxr-xr-x | platform_tools/android/bin/android_gdb_app | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/platform_tools/android/bin/android_gdb_app b/platform_tools/android/bin/android_gdb_app index 046fee3dea..68d517b9a0 100755 --- a/platform_tools/android/bin/android_gdb_app +++ b/platform_tools/android/bin/android_gdb_app @@ -5,12 +5,26 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" source $SCRIPT_DIR/android_setup.sh "$@" +source $SCRIPT_DIR/utils/setup_adb.sh -APP_NAME=${APP_ARGS[0]} +app=${APP_ARGS[0]} +if [[ ${app} == '-'* ]]; then + echo "Defaulting to running SampleApp." + app="SampleApp" + APP_ARGS=( "SampleApp" ${APP_ARGS[*]} ) +fi PORT=5039 -source $SCRIPT_DIR/utils/setup_adb.sh - +if [[ ${app} == 'SampleApp' ]]; then + activity="com.skia.sample_app/com.skia.SkiaSampleActivity" + activityShort="com.skia.sample_app" +elif [[ ${app} == "Viewer" ]] ; then + activity="org.skia.viewer/org.skia.viewer.ViewerActivity" + activityShort="org.skia.viewer" +else + echo "ERROR: supports either 'SampleApp' or 'Viewer' as valid apps" + exit 1 +fi # Forward local to remote socket connection. $ADB $DEVICE_SERIAL forward "tcp:$PORT" "tcp:$PORT" @@ -34,13 +48,13 @@ adb_push_if_needed $ANDROID_TOOLCHAIN/gdbserver /data/local/tmp # Launch the app echo "Launching the app..." -$ADB $DEVICE_SERIAL shell am start -n com.skia.sample_app/com.skia.SkiaSampleActivity +$ADB $DEVICE_SERIAL shell "am start -n ${activity} --es cmdLineFlags \"${APP_ARGS[*]:1}\"" # Wait for app process to initialize sleep 2 # Attach gdbserver to the app process -PID=$($ADB shell ps | grep com.skia.sample_app | awk '{print $2}') +PID=$($ADB shell ps | grep ${activityShort} | awk '{print $2}') echo "Attaching to pid: $PID" $ADB $DEVICE_SERIAL shell /data/local/tmp/gdbserver :$PORT --attach $PID & |