add debugging support for android on x86 phone

platform_tools/android/bin/android_gdb

Index: platform_tools/android/bin/android_gdb
===================================================================
--- platform_tools/android/bin/android_gdb	(revision 10224)
+++ platform_tools/android/bin/android_gdb	(working copy)
@@ -9,11 +9,26 @@
 
 # Collect extra arguments to be passed to the Skia binary
 shift
+deviceID=""
 while (( "$#" )); do
-  APP_ARGS="$APP_ARGS $1"
+
+  if [[ $(echo "$1" | grep "^-d$") != "" ]];
+  then
+    deviceID=$2
+    shift
+  else
+    APP_ARGS="$APP_ARGS $1"
+  fi
+
   shift
 done
 
+# hack for x86 support in android_setup.sh
+if [ "$deviceID" == "x86" ] || [ "$deviceID" == "razr_i" ]
+then
+  ANDROID_ARCH=x86
+fi
+
 source $SCRIPT_DIR/android_setup.sh
 source $SCRIPT_DIR/utils/setup_adb.sh
 
@@ -56,7 +71,12 @@
 
 # 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
+fi
 
 # Clean up
 rm -rf $GDB_TMP_DIR