commit a50ef1c12441d9eccfa75409c1392befaf2abed5
author Jean-Baptiste Queru <jbq@google.com> Fri Apr 20 16:15:42 2012 -0700
committer Jean-Baptiste Queru <jbq@google.com> Fri Apr 20 16:15:42 2012 -0700
tree 2640029f25a617ad63790530504df8af6a83b3fc
parent d0427e493edf2e4de2bd60fd1cc8253e9de233fd

Switch to new locations of toolchains

Change-Id: I15a8be11b3d0f1985ffd97dd51a1af18e1ce7b67

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index e7fbcb4..609e1af 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -112,13 +112,14 @@
     # 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=
     case $(get_build_var TARGET_ARCH) in
-        x86) toolchaindir=toolchain/i686-android-linux-4.4.3/bin
+        x86) toolchaindir=x86/i686-android-linux-4.4.3/bin
             ;;
-        arm|*) toolchaindir=toolchain/arm-linux-androideabi-4.4.x/bin
+        arm|*) toolchaindir=arm/arm-linux-androideabi-4.6/bin
             ;;
     esac
     if [ -d "$prebuiltdir/$toolchaindir" ]; then