Commit 79740e9f authored by Thomas Guillem's avatar Thomas Guillem Committed by Jean-Baptiste Kempf
Browse files

build: add arm64-v8a support



Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent 90122406
...@@ -30,7 +30,7 @@ if [ -z "$ANDROID_NDK" -o -z "$ANDROID_SDK" ]; then ...@@ -30,7 +30,7 @@ if [ -z "$ANDROID_NDK" -o -z "$ANDROID_SDK" ]; then
fi fi
if [ -z "$ANDROID_ABI" ]; then if [ -z "$ANDROID_ABI" ]; then
echo "Please set ANDROID_ABI to your architecture: armeabi-v7a, armeabi, x86, x86_64 or mips." echo "Please set ANDROID_ABI to your architecture: armeabi-v7a, armeabi, arm64-v8a, x86, x86_64 or mips."
exit 1 exit 1
fi fi
...@@ -51,6 +51,12 @@ elif [ ${ANDROID_ABI} = "mips" ] ; then ...@@ -51,6 +51,12 @@ elif [ ${ANDROID_ABI} = "mips" ] ; then
PATH_HOST=$TARGET_TUPLE PATH_HOST=$TARGET_TUPLE
HAVE_MIPS=1 HAVE_MIPS=1
PLATFORM_SHORT_ARCH="mips" PLATFORM_SHORT_ARCH="mips"
elif [ ${ANDROID_ABI} = "arm64-v8a" ] ; then
TARGET_TUPLE="aarch64-linux-android"
PATH_HOST=$TARGET_TUPLE
HAVE_ARM=1
HAVE_64=1
PLATFORM_SHORT_ARCH="arm64"
else else
TARGET_TUPLE="arm-linux-androideabi" TARGET_TUPLE="arm-linux-androideabi"
PATH_HOST=$TARGET_TUPLE PATH_HOST=$TARGET_TUPLE
...@@ -171,6 +177,8 @@ elif [ ${ANDROID_ABI} = "armeabi" ] ; then ...@@ -171,6 +177,8 @@ elif [ ${ANDROID_ABI} = "armeabi" ] ; then
EXTRA_CFLAGS="-mfpu=vfp -mcpu=arm1136jf-s -mfloat-abi=softfp" EXTRA_CFLAGS="-mfpu=vfp -mcpu=arm1136jf-s -mfloat-abi=softfp"
fi fi
fi fi
elif [ ${ANDROID_ABI} = "arm64-v8a" ] ; then
EXTRA_CFLAGS=""
elif [ ${ANDROID_ABI} = "x86" ] ; then elif [ ${ANDROID_ABI} = "x86" ] ; then
EXTRA_CFLAGS="-march=pentium -m32" EXTRA_CFLAGS="-march=pentium -m32"
elif [ ${ANDROID_ABI} = "x86_64" ] ; then elif [ ${ANDROID_ABI} = "x86_64" ] ; then
......
...@@ -6,7 +6,7 @@ if [ -z "$ANDROID_NDK" ]; then ...@@ -6,7 +6,7 @@ if [ -z "$ANDROID_NDK" ]; then
fi fi
if [ -z "$ANDROID_ABI" ]; then if [ -z "$ANDROID_ABI" ]; then
echo "Please set ANDROID_ABI to your architecture: armeabi-v7a, armeabi, x86, x86_64 or mips." echo "Please set ANDROID_ABI to your architecture: armeabi-v7a, armeabi, arm64-v8a, x86, x86_64 or mips."
exit 1 exit 1
fi fi
...@@ -19,7 +19,7 @@ fi ...@@ -19,7 +19,7 @@ fi
VLC_SOURCEDIR=.. VLC_SOURCEDIR=..
CFLAGS="-g -O2 -fstrict-aliasing -funsafe-math-optimizations" CFLAGS="-g -O2 -fstrict-aliasing -funsafe-math-optimizations"
if [ -n "$HAVE_ARM" ]; then if [ -n "$HAVE_ARM" -a ! -n "$HAVE_64" ]; then
CFLAGS="${CFLAGS} -mlong-calls" CFLAGS="${CFLAGS} -mlong-calls"
fi fi
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment