Add back ARM_EABI_TOOLCHAIN.
ARM_EABI_TOOLCHAIN is still used by the kernel build.
Change-Id: I5cdad0b478c0836e06a2af567e4e212602da1f3b
diff --git a/envsetup.sh b/envsetup.sh
index d3344d2..dee328a 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -131,6 +131,21 @@
export ANDROID_EABI_TOOLCHAIN=$gccprebuiltdir/$toolchaindir
fi
+ export ARM_EABI_TOOLCHAIN=
+ case $ARCH in
+ x86) toolchaindir=x86/i686-eabi-4.4.3/bin
+ ;;
+ arm) toolchaindir=arm/arm-eabi-4.6/bin
+ ;;
+ *)
+ echo "Can't find toolchain for unknown architecture: $ARCH"
+ toolchaindir=xxxxxxxxx
+ ;;
+ esac
+ if [ -d "$gccprebuiltdir/$toolchaindir" ]; then
+ export ARM_EABI_TOOLCHAIN=$gccprebuiltdir/$toolchaindir
+ fi
+
export ANDROID_TOOLCHAIN=$ANDROID_EABI_TOOLCHAIN
export ANDROID_QTOOLS=$T/development/emulator/qtools
export ANDROID_BUILD_PATHS=:$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_QTOOLS:$ANDROID_TOOLCHAIN:$ARM_EABI_TOOLCHAIN$CODE_REVIEWS