commit feec98b139d2ca0b0164a5e178e75ce88b8f492f
author Jean-Baptiste Queru <jbq@google.com> Wed May 16 13:18:39 2012 -0700
committer Jean-Baptiste Queru <jbq@google.com> Wed May 16 13:18:39 2012 -0700
tree 5f3fabe21a06e92d94f179c4bed05de7d937b949
parent f760bcbae298d63a53c710cf8857de6174857e25
parent 62855a83b86c0b40583888f93d8b054c7d8ac99c

resolved conflicts for merge of 62855a83 to jb-dev-plus-aosp

Change-Id: Ic424ff756396463b98d137f8353d4a230e806a07

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index 8b7eea9..84ec3e5 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -118,7 +118,7 @@
     export ANDROID_EABI_TOOLCHAIN=
     local ARCH=$(get_build_var TARGET_ARCH)
     case $ARCH in
-        x86) toolchaindir=x86/i686-android-linux-4.4.3/bin
+        x86) toolchaindir=x86/i686-linux-android-4.6/bin
             ;;
         arm) toolchaindir=arm/arm-linux-androideabi-4.6/bin
             ;;
@@ -737,7 +737,7 @@
    local ARCH=$(get_build_var TARGET_ARCH)
    local GDB
    case "$ARCH" in
-       x86) GDB=i686-android-linux-gdb;;
+       x86) GDB=i686-linux-android-gdb;;
        arm) GDB=arm-linux-androideabi-gdb;;
        *) echo "Unknown arch $ARCH"; return 1;;
    esac