[Android] build: hack toolchain only once

[Thomas Guillem]

vlc-android | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Oct  7 15:10:47 2016 +0200| [fdb66fbfbbc2fe44596a9b0fcd1f75fd91e58c6a] | committer: Thomas Guillem

build: hack toolchain only once

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

 compile-libvlc.sh | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 7833a19..f97b23c 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -307,14 +307,16 @@ then
     exit 1
 fi
 
-# don't use the dummy uchar.c
-cp ${ANDROID_NDK}/platforms/android-21/arch-${PLATFORM_SHORT_ARCH}/usr/include/uchar.h \
-    ${NDK_TOOLCHAIN_DIR}/sysroot/usr/local/include
-
-# Don't mess up nl_langinfo() detection since this symbol is not present for 64
-# bits
-if [ "${HAVE_64}" = 1 ];then
-    rm -f ${NDK_TOOLCHAIN_DIR}/sysroot/usr/local/include/langinfo.h
+if [ ! -z "${NDK_FORCE_ARG}" ];then
+    # don't use the dummy uchar.c
+    cp ${ANDROID_NDK}/platforms/android-21/arch-${PLATFORM_SHORT_ARCH}/usr/include/uchar.h \
+        ${NDK_TOOLCHAIN_DIR}/sysroot/usr/local/include
+
+    # Don't mess up nl_langinfo() detection since this symbol is not present for 64
+    # bits
+    if [ "${HAVE_64}" = 1 ];then
+        rm ${NDK_TOOLCHAIN_DIR}/sysroot/usr/local/include/langinfo.h
+    fi
 fi
 
 if [ ! -z "${NDK_FORCE_ARG}" ];then