commit f04ee373123fab58dfd3adc06966cfe127abf6a6
author David Turner <digit@android.com> Tue Apr 17 02:27:48 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Tue Apr 17 02:27:50 2012 -0700
tree 5f1e810c6873dfb8288d9d2a3a80720265747573
parent 2db32730e79cafcf13e1f898a7bee7f82b0449d6
parent 7d0ede730d55ec28c9e219b7c1e894047ffe50f1

Merge "Update gdbclient for x86 target"

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index bab2d25..e7fbcb4 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -115,7 +115,12 @@
 
     # The gcc toolchain does not exists for windows/cygwin. In this case, do not reference it.
     export ANDROID_EABI_TOOLCHAIN=
-    toolchaindir=toolchain/arm-linux-androideabi-4.4.x/bin
+    case $(get_build_var TARGET_ARCH) in
+        x86) toolchaindir=toolchain/i686-android-linux-4.4.3/bin
+            ;;
+        arm|*) toolchaindir=toolchain/arm-linux-androideabi-4.4.x/bin
+            ;;
+    esac
     if [ -d "$prebuiltdir/$toolchaindir" ]; then
         export ANDROID_EABI_TOOLCHAIN=$prebuiltdir/$toolchaindir
     fi
@@ -744,7 +749,7 @@
        echo >>"$OUT_ROOT/gdbclient.cmds" "target remote $PORT"
        echo >>"$OUT_ROOT/gdbclient.cmds" ""
 
-       arm-linux-androideabi-gdb -x "$OUT_ROOT/gdbclient.cmds" "$OUT_EXE_SYMBOLS/$EXE"
+       $ANDROID_EABI_TOOLCHAIN/*-gdb -x "$OUT_ROOT/gdbclient.cmds" "$OUT_EXE_SYMBOLS/$EXE"
   else
        echo "Unable to determine build system output dir."
    fi