[Android] build: add shortcuts for armeabi-v7a and arm64-v8a" builds

[Thomas Guillem]

vlc-android | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Aug 30 11:18:39 2016 +0200| [bc972c3d7d46bcce8bfebaf13b8ab5b05a05770b] | committer: Thomas Guillem

build: add shortcuts for armeabi-v7a and arm64-v8a" builds

Yes, armeabi-v7a is too long to type

> https://code.videolan.org/videolan/vlc-android/commit/bc972c3d7d46bcce8bfebaf13b8ab5b05a05770b
---

 compile-libvlc.sh | 9 +++++++--
 compile.sh        | 8 ++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 99bd8e5..78f7e83 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -50,8 +50,8 @@ fi
 if [ -z "$ANDROID_ABI" ]; then
     echo "Please pass the ANDROID ABI to the correct architecture, using
                 compile-libvlc.sh -a ARCH
-    ARM:     armeabi-v7a
-    ARM64:   arm64-v8a
+    ARM:     (armeabi-v7a|arm)
+    ARM64:   (arm64-v8a|arm64)
     X86:     x86, x86_64
     MIPS:    mips, mips64."
     exit 1
@@ -230,6 +230,11 @@ VLC_MODULE_BLACKLIST="
 #########
 # FLAGS #
 #########
+if [ "${ANDROID_ABI}" = "arm" ] ; then
+    ANDROID_ABI="armeabi-v7a"
+elif [ "${ANDROID_ABI}" = "arm64" ] ; then
+    ANDROID_ABI="arm64-v8a"
+fi
 
 # Set up ABI variables
 if [ "${ANDROID_ABI}" = "x86" ] ; then
diff --git a/compile.sh b/compile.sh
index 4fb6473..70d89b6 100755
--- a/compile.sh
+++ b/compile.sh
@@ -26,8 +26,8 @@ while [ $# -gt 0 ]; do
     case $1 in
         help|--help|-h)
             echo "Use -a to set the ARCH:"
-            echo "  ARM:     armeabi-v7a"
-            echo "  ARM64:   arm64-v8a"
+            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"
@@ -83,9 +83,9 @@ if [ -z "$ANDROID_ABI" ]; then
    ANDROID_ABI="armeabi-v7a"
 fi
 
-if [ "$ANDROID_ABI" = "armeabi-v7a" ]; then
+if [ "$ANDROID_ABI" = "armeabi-v7a" -o "$ANDROID_ABI" = "arm" ]; then
     GRADLE_ABI="ARMv7"
-elif [ "$ANDROID_ABI" = "arm64-v8a" ]; then
+elif [ "$ANDROID_ABI" = "arm64-v8a" -o "$ANDROID_ABI" = "arm64" ]; then
     GRADLE_ABI="ARMv8"
 elif [ "$ANDROID_ABI" = "x86" ]; then
     GRADLE_ABI="x86"