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)
@@ -2,10 +2,30 @@
 #
 # android_gdb: Pushes gdbserver. Connects and enters debugging environment.
 
+deviceID=""
+while (( "$#" )); do
+
+  if [[ $(echo "$1" | grep "^-d$") != "" ]];
+  then
+    deviceID="$2"
+    shift
+  else
+    gdbVars="${gdbVars[@]} $1"
+  fi
+
+shift
+done
+
+# hack for x86 support in android_setup.sh
+if [ "$deviceID" == "x86" ] || [ "$deviceID" == "razr_i" ]
+then
+  ANDROID_ARCH=x86
+fi
+
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # setup the gdbserver
-$SCRIPT_DIR/android_gdbserver $@
+source $SCRIPT_DIR/android_gdbserver ${gdbVars[@]}

[djsollen, 2013/07/30 12:37:51]

I would not source it.  Doing so could cause us to accidentally overwrite
variables that we didn't intend to and doesn't offer any other benefit that I
can see.

[yunchao, 2013/07/31 02:11:53]

If we don't source it, ANDROID_ARCH env parameter above will not transfer into
android_gdbserver, when the later execute "source android_setup.sh", no
ANDROID_ARCH  transfer into android_setup.sh, so it would still think it is an
arm-based machine(although "-d x86" are added into command line parameter) and
use arm tool_chains to run gdbserver. 
Well, we can pass all command line parameters to android_gdbserver and analyze
it again if you still think we should not source it to pass the context from
android_gdb_exe. 

[djsollen, 2013/07/31 13:45:06]

I see what your saying, but you can also just export ANDROID_ARCH (on line 22)
and get that behavior without all the side effects of sourcing this file.

[yunchao, 2013/08/01 02:10:52]

Yes, very good suggestion, djsollen. I have update the patch accordingly. Also,
the same work is added into andorid_gdb to support remote debugging for x86
phone. please help to review it. 

 
 # quit if gdbserver setup failed
 if [[ "$?" != "0" ]]; then
@@ -18,7 +38,7 @@
 
 # variables that must match those in gdb_server
 GDB_TMP_DIR=$(pwd)/android_gdb_tmp
-APP_NAME=$(basename $1)
+APP_NAME=$(basename ${gdbVars[0]})
 PORT=5039
 
 # Set up gdb commands
@@ -37,7 +57,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