build: add NDK_BUILD

And handle Windows specific command line in one file.

compile-libvlc.sh

@@ -98,7 +98,9 @@ if [ ! -z "$MSYSTEM_PREFIX" ] ; then
     # The make.exe and awk.exe from the toolchain don't work in msys
     export PATH="$MSYSTEM_PREFIX/bin:/usr/bin:${NDK_TOOLCHAIN_PATH}:${PATH}"
     ON_WINDOWS=1
+    OSCMD=.cmd
 fi
+NDK_BUILD=$ANDROID_NDK/ndk-build$OSCMD
 
 ##########
 # CFLAGS #
@@ -681,7 +683,7 @@ LOCAL_CXXFLAGS := -std=c++11
 include $(BUILD_SHARED_LIBRARY)
 EOF
 
-$ANDROID_NDK/ndk-build$OSCMD -C build \
+$NDK_BUILD -C build \
     APP_STL="c++_shared" \
     APP_CPPFLAGS="-frtti -fexceptions" \
     VLC_SRC_DIR="$VLC_SRC_DIR" \

compile-medialibrary.sh

@@ -163,11 +163,7 @@ MEDIALIBRARY_LDLIBS="$VLC_OUT_LDLIBS \
 -L$MEDIALIBRARY_MODULE_DIR/$SQLITE_RELEASE/build-$ANDROID_ABI/.libs -lsqlite3 \
 -L${NDK_LIB_DIR} -lc++abi ${NDK_LIB_UNWIND}"
 
-if [ $ON_WINDOWS -eq 1 ]; then
-    OSCMD=.cmd
-fi
-
-$ANDROID_NDK/ndk-build$OSCMD -C medialibrary \
+$NDK_BUILD -C medialibrary \
     APP_STL="c++_shared" \
     LOCAL_CPP_FEATURES="rtti exceptions" \
     APP_BUILD_SCRIPT=jni/Android.mk \

compile.sh

@@ -276,7 +276,7 @@ compile() {
         AVLC_SOURCED=1 . ./compile-libvlc.sh
         avlc_build
 
-        $ANDROID_NDK/ndk-build$OSCMD -C libvlc \
+        $NDK_BUILD -C libvlc \
             VLC_SRC_DIR="$VLC_SRC_DIR" \
             VLC_BUILD_DIR="$VLC_BUILD_DIR" \
             VLC_OUT_LDLIBS="$VLC_OUT_LDLIBS" \