Re-organize Android scripts

platform_tools/android/bin/android_gdb_exe

Index: platform_tools/android/bin/android_gdb_exe
===================================================================
--- platform_tools/android/bin/android_gdb_exe	(revision 10559)
+++ platform_tools/android/bin/android_gdb_exe	(working copy)
@@ -2,30 +2,11 @@
 #
 # 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
-  export ANDROID_ARCH=x86
-fi
-
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+source $SCRIPT_DIR/android_setup.sh
 
 # setup the gdbserver
-$SCRIPT_DIR/android_gdbserver ${gdbVars[@]}
+$SCRIPT_DIR/android_gdbserver -d ${DEVICE_ID} ${APP_ARGS}
 
 # quit if gdbserver setup failed
 if [[ "$?" != "0" ]]; then
@@ -38,7 +19,7 @@
 
 # variables that must match those in gdb_server
 GDB_TMP_DIR=$(pwd)/android_gdb_tmp
-APP_NAME=$(basename ${gdbVars[0]})
+APP_NAME=${APP_ARGS[0]}
 PORT=5039
 
 # Set up gdb commands
@@ -53,8 +34,6 @@
 echo "continue" >> $GDBSETUP
 echo "sharedLibrary $APP_NAME" >> $GDBSETUP
 
-source $SCRIPT_DIR/android_setup.sh
-
 # Launch gdb client
 echo "Entering gdb client shell"
 if [ "$ANDROID_ARCH" == "x86" ]