[Android] compile.sh: remove obsolete workaround
Edward Wang
git at videolan.org
Sun Jan 13 02:40:29 CET 2013
vlc-ports/android | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Sat Jan 12 20:40:09 2013 -0500| [28532d6b8cc7586c07538e073970b7928e0a3b39] | committer: Edward Wang
compile.sh: remove obsolete workaround
> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=28532d6b8cc7586c07538e073970b7928e0a3b39
---
compile.sh | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/compile.sh b/compile.sh
index e6c65de..4b36c9d 100755
--- a/compile.sh
+++ b/compile.sh
@@ -49,7 +49,7 @@ EOF
# Set up ABI variables
if [ ${ANDROID_ABI} = "x86" ] ; then
- TARGET_TUPLE="i686-android-linux"
+ TARGET_TUPLE="i686-linux-android"
PATH_HOST="x86"
HAVE_X86=1
PLATFORM_SHORT_ARCH="x86"
@@ -65,18 +65,6 @@ else
PLATFORM_SHORT_ARCH="arm"
fi
-if [ ${ANDROID_ABI} = "x86" ] ; then
- # x86 toolchain location changes in NDK r8b
- case "$REL" in
- 8?)
- TARGET_TUPLE="i686-linux-android"
- ;;
- *)
- TARGET_TUPLE="i686-android-linux"
- ;;
- esac
-fi
-
export TARGET_TUPLE
export PATH_HOST
export HAVE_ARM
More information about the Android
mailing list