add debugging support for android on x86 phone

platform_tools/android/bin/android_gdb

 #!/bin/bash
 #
 # android_gdb: Pushes parameter binary and gdbserver. Connects
 # and enters debugging environment.
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 APP_NAME=$(basename $1)
 PORT=5039
 
 # 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
 
 echo "Installing Skia Android app"
 $SCRIPT_DIR/android_install_skia -f
 
 # Forward local to remote socket connection.
 $ADB forward "tcp:$PORT" "tcp:$PORT"
 
 # We kill all previous instances of gdbserver to rid all port overriding errors.
@@ skipping 22 matching lines @@
 
 # Set up gdb commands
 GDBSETUP=$GDB_TMP_DIR/gdb.setup
 echo "file $GDB_TMP_DIR/app_process" >> $GDBSETUP
 echo "target remote :$PORT" >> $GDBSETUP
 echo "set solib-absolute-prefix $GDB_TMP_DIR" >> $GDBSETUP
 echo "set solib-search-path $GDB_TMP_DIR" >> $GDBSETUP
 
 # 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