commit 1f87795eef3ab5f63675dc6e01f304d1a6e46d2a
author Jing Yu <jingyu@google.com> Fri Jan 06 14:14:06 2012 -0800
committer Jing Yu <jingyu@google.com> Fri Jan 06 14:14:06 2012 -0800
tree d0c84439a6281d278d86f51e9e04e9132dfd7f1f
parent c7a10ddd3115a40de10b34d7dbfe92134ce7ae8f

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

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index 8fe6433..9c121f3 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -112,12 +112,13 @@
     # 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=