From 768f0d7876e8489ad88b2438872a8572821df104 Mon Sep 17 00:00:00 2001
From: Joachim Fritzsch <joachim.fritzsch@gmail.com>
Date: Sat, 16 Nov 2013 15:08:01 +0100
Subject: [PATCH] android: fix typo in x86 build scripts.

---
 android/build_boinc_x86.sh   | 10 +++++-----
 android/build_curl_x86.sh    |  8 ++++----
 android/build_openssl_x86.sh |  8 ++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/android/build_boinc_x86.sh b/android/build_boinc_x86.sh
index 610225469a..ff9c78d300 100755
--- a/android/build_boinc_x86.sh
+++ b/android/build_boinc_x86.sh
@@ -14,14 +14,14 @@ export BOINC=".." #BOINC source code
 
 export ANDROIDTC="$HOME/androidx86-tc"
 export TCBINARIES="$ANDROIDTC/bin"
-export TCINCLUDES="$ANDROIDTC/i686-android-linux"
+export TCINCLUDES="$ANDROIDTC/i686-linux-android"
 export TCSYSROOT="$ANDROIDTC/sysroot"
 export STDCPPTC="$TCINCLUDES/lib/libstdc++.a"
 
 export PATH="$PATH:$TCBINARIES:$TCINCLUDES/bin"
-export CC=i686-android-linux-gcc
-export CXX=i686-android-linux-g++
-export LD=i686-android-linux-ld
+export CC=i686-linux-android-gcc
+export CXX=i686-linux-android-g++
+export LD=i686-linux-android-ld
 export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -DDECLARE_TIMEZONE -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer"
 export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -funroll-loops -fexceptions -O3 -fomit-frame-pointer"
 export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog"
@@ -48,7 +48,7 @@ make stage
 
 echo "Stripping Binaries"
 cd stage/usr/local/bin
-i686-android-linux-strip *
+i686-linux-android-strip *
 cd ../../../../
 
 echo "Copy Assets"
diff --git a/android/build_curl_x86.sh b/android/build_curl_x86.sh
index 0b2355ef64..c9b52df24f 100755
--- a/android/build_curl_x86.sh
+++ b/android/build_curl_x86.sh
@@ -14,14 +14,14 @@ CURL="/home/boincadm/src/curl-7.28.1" #CURL sources, required by BOINC
 
 export ANDROIDTC="$HOME/androidx86-tc"
 export TCBINARIES="$ANDROIDTC/bin"
-export TCINCLUDES="$ANDROIDTC/i686-android-linux"
+export TCINCLUDES="$ANDROIDTC/i686-linux-android"
 export TCSYSROOT="$ANDROIDTC/sysroot"
 export STDCPPTC="$TCINCLUDES/lib/libstdc++.a"
 
 export PATH="$PATH:$TCBINARIES:$TCINCLUDES/bin"
-export CC=i686-android-linux-gcc
-export CXX=i686-android-linux-g++
-export LD=i686-android-linux-ld
+export CC=i686-linux-android-gcc
+export CXX=i686-linux-android-g++
+export LD=i686-linux-android-ld
 export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer"
 export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -funroll-loops -fexceptions -O3 -fomit-frame-pointer"
 export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog"
diff --git a/android/build_openssl_x86.sh b/android/build_openssl_x86.sh
index 5d43bf5e1e..fb1b86b5d1 100755
--- a/android/build_openssl_x86.sh
+++ b/android/build_openssl_x86.sh
@@ -14,14 +14,14 @@ OPENSSL="/home/boincadm/src/openssl-1.0.1c" #openSSL sources, requiered by BOINC
 
 export ANDROIDTC="$HOME/androidx86-tc"
 export TCBINARIES="$ANDROIDTC/bin"
-export TCINCLUDES="$ANDROIDTC/i686-android-linux"
+export TCINCLUDES="$ANDROIDTC/i686-linux-android"
 export TCSYSROOT="$ANDROIDTC/sysroot"
 export STDCPPTC="$TCINCLUDES/lib/libstdc++.a"
 
 export PATH="$PATH:$TCBINARIES:$TCINCLUDES/bin"
-export CC=i686-android-linux-gcc
-export CXX=i686-android-linux-g++
-export LD=i686-android-linux-ld
+export CC=i686-linux-android-gcc
+export CXX=i686-linux-android-g++
+export LD=i686-linux-android-ld
 export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer"
 export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -funroll-loops -fexceptions -O3 -fomit-frame-pointer"
 export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog"