fix debugging script for the SampleApp
R=scroggo@google.com
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/164773002
git-svn-id: http://skia.googlecode.com/svn/trunk@13444 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/platform_tools/android/bin/android_gdb_apk b/platform_tools/android/bin/android_gdb_apk
index a87b948..a1783cc 100755
--- a/platform_tools/android/bin/android_gdb_apk
+++ b/platform_tools/android/bin/android_gdb_apk
@@ -11,8 +11,6 @@
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 /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 @@
# 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