[Android] Move PLATFORM_SHORT_ARCH to compile-libvlc.sh

[Jean-Baptiste Kempf]

vlc-ports/android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Feb  5 17:41:53 2015 +0100| [58b08bc534a6aa99e9dc77c80edcc0f444bd7f36] | committer: Jean-Baptiste Kempf

Move PLATFORM_SHORT_ARCH to compile-libvlc.sh

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=58b08bc534a6aa99e9dc77c80edcc0f444bd7f36
---

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

diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 0b71c7f..1979b5c 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -66,26 +66,32 @@ EOF
 if [ ${ANDROID_ABI} = "x86" ] ; then
     TARGET_TUPLE="i686-linux-android"
     PATH_HOST="x86"
+    PLATFORM_SHORT_ARCH="x86"
 elif [ ${ANDROID_ABI} = "x86_64" ] ; then
     TARGET_TUPLE="x86_64-linux-android"
     PATH_HOST="x86_64"
+    PLATFORM_SHORT_ARCH="x86_64"
     HAVE_64=1
 elif [ ${ANDROID_ABI} = "mips" ] ; then
     TARGET_TUPLE="mipsel-linux-android"
     PATH_HOST=$TARGET_TUPLE
+    PLATFORM_SHORT_ARCH="mips"
 elif [ ${ANDROID_ABI} = "mips64" ] ; then
     TARGET_TUPLE="mips64el-linux-android"
     PATH_HOST=$TARGET_TUPLE
+    PLATFORM_SHORT_ARCH="mips64"
     HAVE_64=1
 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
     HAVE_ARM=1
+    PLATFORM_SHORT_ARCH="arm"
 fi
 
 # try to detect NDK version
diff --git a/compile.sh b/compile.sh
index 161e65d..ee46b5b 100755
--- a/compile.sh
+++ b/compile.sh
@@ -52,25 +52,20 @@ HAVE_64=0
 if [ ${ANDROID_ABI} = "x86" ] ; then
     TARGET_TUPLE="i686-linux-android"
     PATH_HOST="x86"
-    PLATFORM_SHORT_ARCH="x86"
 elif [ ${ANDROID_ABI} = "x86_64" ] ; then
     TARGET_TUPLE="x86_64-linux-android"
     PATH_HOST="x86_64"
     HAVE_64=1
-    PLATFORM_SHORT_ARCH="x86_64"
 elif [ ${ANDROID_ABI} = "mips" ] ; then
     TARGET_TUPLE="mipsel-linux-android"
     PATH_HOST=$TARGET_TUPLE
-    PLATFORM_SHORT_ARCH="mips"
 elif [ ${ANDROID_ABI} = "arm64-v8a" ] ; then
     TARGET_TUPLE="aarch64-linux-android"
     PATH_HOST=$TARGET_TUPLE
     HAVE_64=1
-    PLATFORM_SHORT_ARCH="arm64"
 else
     TARGET_TUPLE="arm-linux-androideabi"
     PATH_HOST=$TARGET_TUPLE
-    PLATFORM_SHORT_ARCH="arm"
 fi
 
 # try to detect NDK version