[Android] Revert "compile: move ndk detection up"

[Hugo Beauzée-Luyssen]

vlc-android | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Thu Mar 16 09:58:35 2017 +0100| [46bebeaa7c73b008a4fc102bb5a1fcd8d8993899] | committer: Hugo Beauzée-Luyssen

Revert "compile: move ndk detection up"

This reverts commit bda4beabc0d097fc94a53a72772e5eb762bc11d5.
This is unnecessary in the end, and breaks 64 bits builds

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

 compile-libvlc.sh | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 4caef92..7ce6bea 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -231,20 +231,6 @@ VLC_MODULE_BLACKLIST="
     .dummy
 "
 
-# try to detect NDK version
-REL=$(grep -o '^Pkg.Revision.*[0-9]*.*' $ANDROID_NDK/source.properties |cut -d " " -f 3 | cut -d "." -f 1)
-
-if [ "$REL" -ge 13 ]; then
-    if [ "${HAVE_64}" = 1 ];then
-        ANDROID_API=21
-    else
-        ANDROID_API=9
-    fi
-else
-    echo "You need the NDKv13 or later"
-    exit 1
-fi
-
 #########
 # FLAGS #
 #########
@@ -283,6 +269,20 @@ else
     exit 2
 fi
 
+# try to detect NDK version
+REL=$(grep -o '^Pkg.Revision.*[0-9]*.*' $ANDROID_NDK/source.properties |cut -d " " -f 3 | cut -d "." -f 1)
+
+if [ "$REL" -ge 13 ]; then
+    if [ "${HAVE_64}" = 1 ];then
+        ANDROID_API=21
+    else
+        ANDROID_API=9
+    fi
+else
+    echo "You need the NDKv13 or later"
+    exit 1
+fi
+
 NDK_FORCE_ARG=
 NDK_TOOLCHAIN_DIR=${PWD}/toolchains/${PLATFORM_SHORT_ARCH}
 NDK_TOOLCHAIN_PROPS=${NDK_TOOLCHAIN_DIR}/source.properties