[Android] build: drop MIPS / MIPS64 support
Victorien Le Couviour--Tuffet
git at videolan.org
Tue Oct 23 17:26:38 CEST 2018
vlc-android | branch: 4.0 | Victorien Le Couviour--Tuffet <victorien.lecouviour.tuffet at gmail.com> | Sat Sep 22 16:34:05 2018 +0200| [97d7589583d608863e6004e446b2aea0d5f85bc3] | committer: Thomas Guillem
build: drop MIPS / MIPS64 support
This has been dropped in the NDK 17
> https://code.videolan.org/videolan/vlc-android/commit/97d7589583d608863e6004e446b2aea0d5f85bc3
---
compile-libvlc.sh | 17 ++---------------
compile.sh | 5 -----
2 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 31c5f8f95..1791df138 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -58,8 +58,7 @@ if [ -z "$ANDROID_ABI" ]; then
compile-libvlc.sh -a ARCH
ARM: (armeabi-v7a|arm)
ARM64: (arm64-v8a|arm64)
- X86: x86, x86_64
- MIPS: mips, mips64."
+ X86: x86, x86_64"
exit 1
fi
@@ -253,13 +252,6 @@ elif [ "${ANDROID_ABI}" = "x86_64" ] ; then
TARGET_TUPLE="x86_64-linux-android"
PLATFORM_SHORT_ARCH="x86_64"
HAVE_64=1
-elif [ "${ANDROID_ABI}" = "mips" ] ; then
- TARGET_TUPLE="mipsel-linux-android"
- PLATFORM_SHORT_ARCH="mips"
-elif [ "${ANDROID_ABI}" = "mips64" ] ; then
- TARGET_TUPLE="mips64el-linux-android"
- PLATFORM_SHORT_ARCH="mips64"
- HAVE_64=1
elif [ "${ANDROID_ABI}" = "arm64-v8a" ] ; then
TARGET_TUPLE="aarch64-linux-android"
HAVE_ARM=1
@@ -386,11 +378,6 @@ if [ "${ANDROID_ABI}" = "armeabi-v7a" ] ; then
EXTRA_CFLAGS="${EXTRA_CFLAGS} -mthumb -mfloat-abi=softfp"
elif [ "${ANDROID_ABI}" = "x86" ] ; then
EXTRA_CFLAGS="-mtune=atom -msse3 -mfpmath=sse -m32"
-elif [ "${ANDROID_ABI}" = "mips" ] ; then
- EXTRA_CFLAGS="-march=mips32 -mtune=mips32r2 -mhard-float"
- # All MIPS Linux kernels since 2.4.4 will trap any unimplemented FPU
- # instruction and emulate it, so we select -mhard-float.
- # See http://www.linux-mips.org/wiki/Floating_point#The_Linux_kernel_and_floating_point
fi
EXTRA_CFLAGS="${EXTRA_CFLAGS} -MMD -MP -fpic -ffunction-sections -funwind-tables \
@@ -409,7 +396,7 @@ if [ ${ANDROID_ABI} = "armeabi-v7a" ]; then
EXTRA_LDFLAGS="${EXTRA_LDFLAGS} -Wl,--fix-cortex-a8"
fi
NDK_LIB_DIR="${NDK_TOOLCHAIN_DIR}/${TARGET_TUPLE}/lib"
-if [ "${PLATFORM_SHORT_ARCH}" = "x86_64" -o "${PLATFORM_SHORT_ARCH}" = "mips64" ];then
+if [ "${PLATFORM_SHORT_ARCH}" = "x86_64" ];then
NDK_LIB_DIR="${NDK_LIB_DIR}64"
fi
diff --git a/compile.sh b/compile.sh
index 930403e61..f1312e2d7 100755
--- a/compile.sh
+++ b/compile.sh
@@ -29,7 +29,6 @@ while [ $# -gt 0 ]; do
echo " ARM: (armeabi-v7a|arm)"
echo " ARM64: (arm64-v8a|arm64)"
echo " X86: x86, x86_64"
- echo " MIPS: mips, mips64."
echo "Use --release to build in release mode"
echo "Use --signrelease to build in release mode and sign apk, see vlc-android/build.gradle"
echo "Use -s to set your keystore file and -p for the password"
@@ -100,10 +99,6 @@ elif [ "$ANDROID_ABI" = "x86" ]; then
GRADLE_ABI="x86"
elif [ "$ANDROID_ABI" = "x86_64" ]; then
GRADLE_ABI="x86_64"
-elif [ "$ANDROID_ABI" = "mips" ]; then
- GRADLE_ABI="MIPS"
-elif [ "$ANDROID_ABI" = "mips64" ]; then
- GRADLE_ABI="MIPS64"
else
diagnostic "Invalid arch specified: '$ANDROID_ABI'."
diagnostic "Try --help for more information"
More information about the Android
mailing list