am fad629f4: am 7f2ad751: Merge "Switch x86 default compiler to multilib version"

* commit 'fad629f4dd07720b427c6a219ad93886e23ca277':
  Switch x86 default compiler to multilib version
This commit is contained in:
Ying Wang
2013-09-14 13:49:15 -07:00
committed by Android Git Automerger
4 changed files with 8 additions and 8 deletions

View File

@@ -126,7 +126,7 @@ function setpaths()
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
;;
@@ -923,7 +923,7 @@ function gdbclient()
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;;