commit cb8f66305caf4f9252112608ad93e2ef58321244
author Jean-Baptiste Queru <jbq@google.com> Wed Jan 11 04:23:06 2012 -0800
committer Jean-Baptiste Queru <jbq@google.com> Wed Jan 11 04:23:06 2012 -0800
tree 39e50f8e1a5ec7a46da2d88074f0b317c3b79a85
parent dfd93fc209a0fec27bf92b8e139ea25f46e0f514

Revert "Point arm toolchain to the new gcc-4.6 one."

This reverts commit 1f87795eef3ab5f63675dc6e01f304d1a6e46d2a.

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index 9c121f3..8fe6433 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -112,13 +112,12 @@
     # 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=arm/arm-linux-androideabi-4.6/bin
-    if [ -d "$gccprebuiltdir/$toolchaindir" ]; then
-        export ANDROID_EABI_TOOLCHAIN=$gccprebuiltdir/$toolchaindir
+    toolchaindir=toolchain/arm-linux-androideabi-4.4.x/bin
+    if [ -d "$prebuiltdir/$toolchaindir" ]; then
+        export ANDROID_EABI_TOOLCHAIN=$prebuiltdir/$toolchaindir
     fi
 
     export ARM_EABI_TOOLCHAIN=