diff options
| author |  aam <aam@google.com> | 2015-12-10 14:14:56 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-12-10 14:14:56 -0800 |
| commit | 419c37269f7d0786e9058c93003061ed8037a402 (patch) | |
| tree | f076bfb02dd004b1c5e44ae344dd64684012f1d6 /platform_tools | |
| parent | 30da5f7a1e4cf0daa2f284b4cae5128b23f0db96 (diff) | |
Fix 'debugging on Android' android_gdb_app script.
1) com.skia -> com.skia.sample_app
2) pass arguments to android_gdb_app to android_setup.sh so you can build gdbserver binaries for your actual device(rather than default arm64). This allows you to run it like this for example:
./platform_tools/android/bin/android_gdb_app -d nexus_6
BUG=skia:
DOCS_PREVIEW= https://skia.org/?cl=1509853006
Review URL: https://codereview.chromium.org/1509853006
Diffstat (limited to 'platform_tools')
| -rwxr-xr-x | platform_tools/android/bin/android_gdb_app | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/platform_tools/android/bin/android_gdb_app b/platform_tools/android/bin/android_gdb_app index 31cf99148f..f0879fa10f 100755 --- a/platform_tools/android/bin/android_gdb_app +++ b/platform_tools/android/bin/android_gdb_app @@ -4,7 +4,7 @@ # the debugging environment. SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -source $SCRIPT_DIR/android_setup.sh +source $SCRIPT_DIR/android_setup.sh "$@" APP_NAME=${APP_ARGS[0]} PORT=5039 @@ -31,21 +31,21 @@ mkdir -p $GDB_TMP_DIR echo "Copying symbol files" adb_pull_if_needed /system/bin/app_process $GDB_TMP_DIR adb_pull_if_needed /system/lib/libc.so $GDB_TMP_DIR -adb_pull_if_needed /data/data/com.skia/lib/libskia_android.so $GDB_TMP_DIR -adb_pull_if_needed /data/data/com.skia/lib/libSampleApp.so $GDB_TMP_DIR +adb_pull_if_needed /data/data/com.skia.sample_app/lib/libskia_android.so $GDB_TMP_DIR +adb_pull_if_needed /data/data/com.skia.sample_app/lib/libSampleApp.so $GDB_TMP_DIR echo "Pushing gdbserver..." 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/com.skia.SkiaSampleActivity +$ADB $DEVICE_SERIAL shell am start -n com.skia.sample_app/com.skia.SkiaSampleActivity # Wait for app process to initialize sleep 2 # Attach gdbserver to the app process -PID=$($ADB shell ps | grep com.skia | awk '{print $2}') +PID=$($ADB shell ps | grep com.skia.sample_app | awk '{print $2}') echo "Attaching to pid: $PID" $ADB $DEVICE_SERIAL shell /data/local/tmp/gdbserver :$PORT --attach $PID & |