[Android] Remove unused HAVE_X86 variable
Jean-Baptiste Kempf
git at videolan.org
Wed Feb 4 19:14:31 CET 2015
vlc-ports/android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Feb 4 19:08:44 2015 +0100| [1f92c11c2d81eded2a7501087190ea28b44f4cb2] | committer: Jean-Baptiste Kempf
Remove unused HAVE_X86 variable
> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=1f92c11c2d81eded2a7501087190ea28b44f4cb2
---
compile-libvlc.sh | 2 --
compile.sh | 5 -----
2 files changed, 7 deletions(-)
diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 149065e..8e68c0d 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -26,12 +26,10 @@ done
if [ ${ANDROID_ABI} = "x86" ] ; then
TARGET_TUPLE="i686-linux-android"
PATH_HOST="x86"
- HAVE_X86=1
PLATFORM_SHORT_ARCH="x86"
elif [ ${ANDROID_ABI} = "x86_64" ] ; then
TARGET_TUPLE="x86_64-linux-android"
PATH_HOST="x86_64"
- HAVE_X86=1
HAVE_64=1
PLATFORM_SHORT_ARCH="x86_64"
elif [ ${ANDROID_ABI} = "mips" ] ; then
diff --git a/compile.sh b/compile.sh
index 645ec00..3e6808f 100755
--- a/compile.sh
+++ b/compile.sh
@@ -54,19 +54,16 @@ if [ "$BUILD" = 0 -a "$FETCH" = 0 ];then
fi
HAVE_ARM=0
-HAVE_X86=0
HAVE_64=0
# Set up ABI variables
if [ ${ANDROID_ABI} = "x86" ] ; then
TARGET_TUPLE="i686-linux-android"
PATH_HOST="x86"
- HAVE_X86=1
PLATFORM_SHORT_ARCH="x86"
elif [ ${ANDROID_ABI} = "x86_64" ] ; then
TARGET_TUPLE="x86_64-linux-android"
PATH_HOST="x86_64"
- HAVE_X86=1
HAVE_64=1
PLATFORM_SHORT_ARCH="x86_64"
elif [ ${ANDROID_ABI} = "mips" ] ; then
@@ -120,7 +117,6 @@ EOF
export TARGET_TUPLE
export PATH_HOST
export HAVE_ARM
-export HAVE_X86
export HAVE_64
export PLATFORM_SHORT_ARCH
@@ -257,7 +253,6 @@ echo "export PATH=$NDK_TOOLCHAIN_PATH:\${ANDROID_SDK}/platform-tools:\${PATH}" >
# CPU flags
echo "export HAVE_ARM=${HAVE_ARM}" >> env.sh
-echo "export HAVE_X86=${HAVE_X86}" >> env.sh
echo "export NO_ARMV6=${NO_ARMV6}" >> env.sh
echo "export NO_FPU=${NO_FPU}" >> env.sh
More information about the Android
mailing list