commit 0ab21d3ed34edbeb8631002db47a6a309581d9a4
author Nick Kralevich <nnk@google.com> Fri Nov 11 09:02:01 2011 -0800
committer Nick Kralevich <nnk@google.com> Fri Nov 11 09:02:01 2011 -0800
tree 1c9b0a5b11d09f8b39c89c16856cf4b6e115e4c2
parent ba2c734f71202522464db540260b0df696d26c06

make gdbclient work on x86

Change-Id: I2fd4fc2b89db13a8db1b177afdab593772cb12f8

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index bab2d25..92728b7 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -704,6 +704,14 @@
    local OUT_SO_SYMBOLS=$(get_abs_build_var TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)
    local OUT_EXE_SYMBOLS=$(get_abs_build_var TARGET_OUT_EXECUTABLES_UNSTRIPPED)
    local PREBUILTS=$(get_abs_build_var ANDROID_PREBUILTS)
+   local ARCH=$(get_build_var TARGET_ARCH)
+   local GDB
+   case "$ARCH" in
+       x86) GDB=i686-android-linux-gdb;;
+       arm) GDB=arm-linux-androideabi-gdb;;
+       *) echo "Unknown arch $ARCH"; return 1;;
+   esac
+
    if [ "$OUT_ROOT" -a "$PREBUILTS" ]; then
        local EXE="$1"
        if [ "$EXE" ] ; then
@@ -744,7 +752,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"
+       $GDB -x "$OUT_ROOT/gdbclient.cmds" "$OUT_EXE_SYMBOLS/$EXE"
   else
        echo "Unable to determine build system output dir."
    fi