[Android] compile.sh: Allow compiliation on NDK r8b for x86
Edward Wang
git at videolan.org
Fri Aug 3 15:41:40 CEST 2012
android | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Fri Aug 3 09:41:33 2012 -0400| [48d754c58d4e03cf45d422bdfc1f4c223281c0b8] | committer: Edward Wang
compile.sh: Allow compiliation on NDK r8b for x86
> http://git.videolan.org/gitweb.cgi/android.git/?a=commit;h=48d754c58d4e03cf45d422bdfc1f4c223281c0b8
---
compile.sh | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/compile.sh b/compile.sh
index d141c98..02e9b4a 100755
--- a/compile.sh
+++ b/compile.sh
@@ -63,6 +63,19 @@ else
HAVE_ARM=1
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