Revert "Reference new location of SDK toolchain"
This reverts commit 6e8d9298782ce4d5a7d506638ced4de0396735f9.
diff --git a/Makefile.android b/Makefile.android
index e2dccb7..22d7438 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -95,11 +95,7 @@
# relevant headers and 32-bit libraries for audio (The host 64-bit Lucid
# doesn't provide these anymore, only their 64-bit versions).
ifeq ($(HOST_OS),linux)
- ifneq ($(wildcard prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.4.3/bin/i686-linux),)
- HOST_SDK_TOOLCHAIN_PREFIX := prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.4.3/bin/i686-linux
- else
- HOST_SDK_TOOLCHAIN_PREFIX := prebuilt/linux-x86/toolchain/i686-linux-glibc2.7-4.4.3/bin/i686-linux
- endif
+ HOST_SDK_TOOLCHAIN_PREFIX := prebuilt/linux-x86/toolchain/i686-linux-glibc2.7-4.4.3/bin/i686-linux
# Don't do anything if the toolchain is not there
ifneq (,$(strip $(wildcard $(HOST_SDK_TOOLCHAIN_PREFIX)-gcc)))
MY_CC := $(HOST_SDK_TOOLCHAIN_PREFIX)-gcc
diff --git a/android-configure.sh b/android-configure.sh
index 638c8cf..6d25d20 100755
--- a/android-configure.sh
+++ b/android-configure.sh
@@ -119,11 +119,7 @@
# On Linux, try to use our 32-bit prebuilt toolchain to generate binaries
# that are compatible with Ubuntu 8.04
if [ -z "$CC" -a -z "$OPTION_CC" -a "$HOST_OS" = linux -a "$OPTION_TRY_64" != "yes" ] ; then
- if [ -d `dirname $0`/../../prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.4.3/bin/i686-linux-gcc] ; then
- HOST_CC=`dirname $0`/../../prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.4.3/bin/i686-linux-gcc
- HOST_CC=`dirname $0`/../../prebuilt/linux-x86/toolchain/i686-linux-glibc2.7-4.4.3/bin/i686-linux-gcc
- else
- fi
+ HOST_CC=`dirname $0`/../../prebuilt/linux-x86/toolchain/i686-linux-glibc2.7-4.4.3/bin/i686-linux-gcc
if [ -f "$HOST_CC" ] ; then
echo "Using prebuilt 32-bit toolchain: $HOST_CC"
CC="$HOST_CC"