[Android] [PATCH 3/3] build: add arm64-v8a support

[Thomas Guillem]

---
 compile.sh   | 10 +++++++++-
 configure.sh |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/compile.sh b/compile.sh
index c0a3e41..ca07811 100755
--- a/compile.sh
+++ b/compile.sh
@@ -30,7 +30,7 @@ if [ -z "$ANDROID_NDK" -o -z "$ANDROID_SDK" ]; then
 fi
 
 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
 fi
 
@@ -51,6 +51,12 @@ elif [ ${ANDROID_ABI} = "mips" ] ; then
     PATH_HOST=$TARGET_TUPLE
     HAVE_MIPS=1
     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
     TARGET_TUPLE="arm-linux-androideabi"
     PATH_HOST=$TARGET_TUPLE
@@ -171,6 +177,8 @@ elif [ ${ANDROID_ABI} = "armeabi" ] ; then
             EXTRA_CFLAGS="-mfpu=vfp -mcpu=arm1136jf-s -mfloat-abi=softfp"
         fi
     fi
+elif [ ${ANDROID_ABI} = "arm64-v8a" ] ; then
+    EXTRA_CFLAGS=""
 elif [ ${ANDROID_ABI} = "x86" ] ; then
     EXTRA_CFLAGS="-march=pentium -m32"
 elif [ ${ANDROID_ABI} = "x86_64" ] ; then
diff --git a/configure.sh b/configure.sh
index 7c3c9d0..bec7966 100755
--- a/configure.sh
+++ b/configure.sh
@@ -6,7 +6,7 @@ if [ -z "$ANDROID_NDK" ]; then
 fi
 
 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
 fi
 
@@ -19,7 +19,7 @@ fi
 VLC_SOURCEDIR=..
 
 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"
 fi
 
-- 
2.1.0