Point arm toolchain to the new gcc-4.6 one.

Tested build mysid-eng, sojus-eng, trygon-eng, yakju-eng.

Change-Id: I742cf9fcf2407b9098c99136d67161ecf062ac01

Conflicts:

	core/combo/TARGET_linux-arm.mk
This commit is contained in:
Jing Yu
2012-01-06 14:14:06 -08:00
parent c7a10ddd31
commit 1f87795eef
4 changed files with 11 additions and 9 deletions

View File

@@ -112,12 +112,13 @@ function setpaths()
# and in with the new
CODE_REVIEWS=
prebuiltdir=$(getprebuilt)
gccprebuiltdir=$(get_abs_build_var ANDROID_GCC_PREBUILTS)
# 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
if [ -d "$prebuiltdir/$toolchaindir" ]; then
export ANDROID_EABI_TOOLCHAIN=$prebuiltdir/$toolchaindir
toolchaindir=arm/arm-linux-androideabi-4.6/bin
if [ -d "$gccprebuiltdir/$toolchaindir" ]; then
export ANDROID_EABI_TOOLCHAIN=$gccprebuiltdir/$toolchaindir
fi
export ARM_EABI_TOOLCHAIN=