Add MD5 support when syncing debug files and option to just start gdbserver

platform_tools/android/bin/android_gdbserver

Index: platform_tools/android/bin/android_gdbserver
diff --git a/platform_tools/android/bin/android_gdb_exe b/platform_tools/android/bin/android_gdbserver
similarity index 60%
copy from platform_tools/android/bin/android_gdb_exe
copy to platform_tools/android/bin/android_gdbserver
index 47864ed7a40edf57853cce946f45db69c366d326..983864cdbd164d61e3c6ab5d8e97a3d9607b2c5b 100755
--- a/platform_tools/android/bin/android_gdb_exe
+++ b/platform_tools/android/bin/android_gdbserver
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# android_gdb: Pushes gdbserver. Connects and enters debugging environment.
+# android_gdbserver: Pushes gdbserver. Starts debugging environment.
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 APP_NAME=$(basename $1)
@@ -20,10 +20,10 @@ source $SCRIPT_DIR/utils/setup_adb.sh
 GDB_TMP_DIR=$(pwd)/android_gdb_tmp
 mkdir $GDB_TMP_DIR
 echo "Copying symbol files"
-$ADB pull /system/bin/skia_launcher $GDB_TMP_DIR
-$ADB pull /system/lib/libc.so $GDB_TMP_DIR
-$ADB pull /data/data/com.skia/lib/libskia_android.so $GDB_TMP_DIR
-$ADB pull /data/data/com.skia/lib/lib$APP_NAME.so $GDB_TMP_DIR
+adb_pull_if_needed /system/bin/skia_launcher $GDB_TMP_DIR/skia_launcher
+adb_pull_if_needed /system/lib/libc.so $GDB_TMP_DIR/libc.so
+adb_pull_if_needed /data/data/com.skia/lib/libskia_android.so $GDB_TMP_DIR/libskia_android.so
+adb_pull_if_needed /data/data/com.skia/lib/lib$APP_NAME.so $GDB_TMP_DIR/lib$APP_NAME.so

[borenet, 2013/06/27 12:46:42]

Optional: adb_pull_if_needed could use basename so that you don't have to state
it twice here.

[djsollen, 2013/06/27 13:34:24]

Done.

 
 echo "Checking for skia_launcher app..."
 if [ ! -f $GDB_TMP_DIR/skia_launcher ]
@@ -55,27 +55,4 @@ $ADB shell ps | grep skia_launcher | awk '{print $2}' | xargs $ADB shell kill
 
 # Starting up gdbserver in android shell
 echo "Starting gdbserver with command: skia_launcher $APP_NAME$APP_ARGS"
-$ADB shell gdbserver :5039 /system/bin/skia_launcher $APP_NAME$APP_ARGS &
-
-# Wait for gdbserver
-sleep 2
-
-# Set up gdb commands
-GDBSETUP=$GDB_TMP_DIR/gdb.setup
-echo "file $GDB_TMP_DIR/skia_launcher" >> $GDBSETUP
-echo "target remote :$PORT" >> $GDBSETUP
-echo "set solib-absolute-prefix $GDB_TMP_DIR" >> $GDBSETUP
-echo "set solib-search-path $GDB_TMP_DIR" >> $GDBSETUP
-
-# The apps shared library symbols are not loaded by default so we load them here
-echo "break skia_launcher.cpp:launch_app" >> $GDBSETUP
-echo "continue" >> $GDBSETUP
-echo "sharedLibrary $APP_NAME" >> $GDBSETUP
-
-
-# Launch gdb client
-echo "Entering gdb client shell"
-$ANDROID_TOOLCHAIN/arm-linux-androideabi-gdb -x $GDBSETUP
-
-# Clean up
-rm -rf $GDB_TMP_DIR
+$ADB shell gdbserver :5039 /system/bin/skia_launcher $APP_NAME$APP_ARGS &