commit c1a5664ea3882800dfc538a9591828f9c429f6d7
author Pavel Chupin <pavel.v.chupin@intel.com> Fri Aug 23 16:49:21 2013 +0400
committer Pavel Chupin <pavel.v.chupin@intel.com> Mon Aug 26 10:42:42 2013 +0400
tree 8842f2193bb1b3ec9369ac856b495f50d8cca9d0
parent 929b3a24b0c1b1ff2488ef08f05040c63aeaa9ed

Switch x86 default compiler to multilib version

Switch from gcc-4.7 32-bit only to gcc-4.7 multilib (32/x32/64) compiler.
Tested x86 image build on Linux and Darwin.

This bionic patch is required:
https://android-review.googlesource.com/#/c/64183

Change-Id: Ifc2c6c5d6a4a1b71a00a87af072bb7f67b1c284d
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index 3639db9..96b193d 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -126,7 +126,7 @@
     export ANDROID_EABI_TOOLCHAIN=
     local ARCH=$(get_build_var TARGET_ARCH)
     case $ARCH in
-        x86) toolchaindir=x86/i686-linux-android-$targetgccversion/bin
+        x86) toolchaindir=x86/x86_64-linux-android-$targetgccversion/bin
             ;;
         arm) toolchaindir=arm/arm-linux-androideabi-$targetgccversion/bin
             ;;
@@ -842,7 +842,7 @@
    local ARCH=$(get_build_var TARGET_ARCH)
    local GDB
    case "$ARCH" in
-       x86) GDB=i686-linux-android-gdb;;
+       x86) GDB=x86_64-linux-android-gdb;;
        arm) GDB=arm-linux-androideabi-gdb;;
        mips) GDB=mipsel-linux-android-gdb;;
        *) echo "Unknown arch $ARCH"; return 1;;