add debugging support for android on x86 phone

platform_tools/android/bin/android_gdb_exe

Index: platform_tools/android/bin/android_gdb_exe
===================================================================
--- platform_tools/android/bin/android_gdb_exe	(revision 10224)
+++ platform_tools/android/bin/android_gdb_exe	(working copy)
@@ -4,6 +4,18 @@
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
+deviceID=""
+if [[ $(echo "$1" | grep "^-d$") != "" ]];
+then
+  deviceID="$2"
+fi
+
+# hack for x86 support in android_setup.sh                          
+if [ "$deviceID" == "x86" ] || [ "$deviceID" == "razr_i" ]          
+then
+  ANDROID_ARCH="x86"                                                
+fi
+

[djsollen, 2013/07/22 13:18:18]

It would be preferable to do something like...

while (( "$#" )); do

  if [[ $(echo "$1" | grep "^-d$") != "" ]];
  then 
    deviceID="$2"
    shift
  else
    gdbVars=("${gdbVars[@]}" "$1")
  fi

shift
done
# setup the gdbserver
$SCRIPT_DIR/android_gdbserver ${gdbVars[@]}

 # setup the gdbserver
 $SCRIPT_DIR/android_gdbserver $@
 
@@ -18,7 +30,7 @@
 
 # variables that must match those in gdb_server
 GDB_TMP_DIR=$(pwd)/android_gdb_tmp
-APP_NAME=$(basename $1)
+APP_NAME=$(basename $3)

[djsollen, 2013/07/22 13:18:18]

replace $3 with ${gdbVars[0]}

 PORT=5039
 
 # Set up gdb commands
@@ -37,7 +49,11 @@
 
 # Launch gdb client
 echo "Entering gdb client shell"
-$ANDROID_TOOLCHAIN/arm-linux-androideabi-gdb -x $GDBSETUP
+if [ "$ANDROID_ARCH" == "x86" ]
+then 
+  $ANDROID_TOOLCHAIN/i686-linux-android-gdb -x $GDBSETUP
+else
+  $ANDROID_TOOLCHAIN/arm-linux-androideabi-gdb -x $GDBSETUP
 
 # Clean up
-rm -rf $GDB_TMP_DIR
+rm -rf $GDB_TMP_DIR