diff options
Diffstat (limited to 'platform_tools')
| -rwxr-xr-x | platform_tools/android/bin/android_gdb_apk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/platform_tools/android/bin/android_gdb_apk b/platform_tools/android/bin/android_gdb_apk index a87b948b96..a1783cc48e 100755 --- a/platform_tools/android/bin/android_gdb_apk +++ b/platform_tools/android/bin/android_gdb_apk @@ -11,8 +11,6 @@ PORT=5039 source $SCRIPT_DIR/utils/setup_adb.sh -echo "Installing Skia Android app" -$SCRIPT_DIR/android_install_skia_apk -f # Forward local to remote socket connection. $ADB forward "tcp:$PORT" "tcp:$PORT" @@ -29,6 +27,9 @@ 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 +echo "Pushing gdbserver..." +adb_push_if_needed $ANDROID_TOOLCHAIN/../gdbserver /data/local/tmp + # Launch the app SK_COMMAND="$APP_ARGS" echo "Running command $SK_COMMAND" @@ -37,7 +38,7 @@ adb shell am start -n com.skia/com.skia.SkiaSampleActivity # Attach gdbserver to the app process PID=$($ADB shell ps | grep com.skia | awk '{print $2}') echo "Attaching to pid: $PID" -$ADB shell /data/data/com.skia/lib/gdbserver :$PORT --attach $PID & +$ADB shell /data/local/tmp/gdbserver :$PORT --attach $PID & # Wait for gdbserver sleep 2 |