[Android] build: simplify windows handling

Thomas Guillem git at videolan.org
Tue May 14 16:47:35 CEST 2019


vlc-android | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue May 14 08:53:57 2019 +0200| [b1d41af8c85c8558797ef6633069faa757208a54] | committer: Thomas Guillem

build: simplify windows handling

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

 compile-libvlc.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 5efbb518f..b42d34ee0 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -111,14 +111,12 @@ NDK_TOOLCHAIN_PATH=${NDK_TOOLCHAIN_DIR}/bin
 CROSS_TOOLS=${NDK_TOOLCHAIN_PATH}/${TARGET_TUPLE}-
 
 export PATH="${NDK_TOOLCHAIN_PATH}:${PATH}"
-ON_WINDOWS=0
+NDK_BUILD=$ANDROID_NDK/ndk-build
 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
+    NDK_BUILD=$NDK_BUILD.cmd
 fi
-NDK_BUILD=$ANDROID_NDK/ndk-build$OSCMD
 
 ##########
 # CFLAGS #



More information about the Android mailing list