Fix android_gdbserver script to work with changes from a137675.

platform_tools/android/bin/android_gdb_exe

 #!/bin/bash
 #
 # android_gdb: Pushes gdbserver. Connects and enters debugging environment.
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source $SCRIPT_DIR/android_setup.sh
 
 # setup the gdbserver
+export BUILDTYPE  # from android_setup.sh

[djsollen, 2014/04/25 17:42:54]

what did this line do exactly?

[hal.canary, 2014/04/25 18:38:20]

So android_gdbserver sees this variable as set by android_setup

 $SCRIPT_DIR/android_gdbserver -d ${DEVICE_ID} ${APP_ARGS[@]}
 
 # quit if gdbserver setup failed
 if [[ "$?" != "0" ]]; then
   echo "ERROR: gdbserver failed to setup properly."
   exit 1
 fi
 
 # Wait for gdbserver
 sleep 2
@@ skipping 10 matching lines @@
 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 launch_app" >> $GDBSETUP
 echo "continue" >> $GDBSETUP
 echo "sharedLibrary $APP_NAME" >> $GDBSETUP
 
 # Launch gdb client
 echo "Entering gdb client shell"
-if [ "$ANDROID_ARCH" == "x86" ]
-then
-  $ANDROID_TOOLCHAIN/i686-linux-android-gdb -x $GDBSETUP
-else
-  $ANDROID_TOOLCHAIN/arm-linux-androideabi-gdb -x $GDBSETUP
-fi
+GDB_COMMAND=$(command ls "$ANDROID_TOOLCHAIN"/*-gdb | head -n1)
+"$GDB_COMMAND" -x $GDBSETUP
 
 # Clean up
 rm -rf $GDB_TMP_DIR