[Android] build: move toolchain hacks before building contribs

[Thomas Guillem]

vlc-android | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Oct  7 14:26:35 2016 +0200| [ab2cbc03017b28d866d5bfd654221df20b798779] | committer: Thomas Guillem

build: move toolchain hacks before building contribs

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

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

diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 368c547..7833a19 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -306,6 +306,17 @@ then
     echo "make_standalone_toolchain.py failed"
     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
+fi
+
 if [ ! -z "${NDK_FORCE_ARG}" ];then
     cp "$ANDROID_NDK/source.properties" "${NDK_TOOLCHAIN_PROPS}"
 fi
@@ -527,14 +538,6 @@ else
 
     VLC_LDFLAGS="${VLC_LDFLAGS} -L${NDK_LIB_DIR} -landroid_support"
 fi
-cp ${ANDROID_NDK}/platforms/android-21/arch-${PLATFORM_SHORT_ARCH}/usr/include/uchar.h \
-    ${NDK_TOOLCHAIN_DIR}/sysroot/usr/local/include
-
-if [ "${HAVE_64}" = 1 ];then
-    # Don't mess up nl_langinfo() detection since this symbol is not present
-    # for 64 bits
-    rm -f ${NDK_TOOLCHAIN_DIR}/sysroot/usr/local/include/langinfo.h
-fi
 
 if [ ! -e ./config.h -o "$RELEASE" = 1 ]; then
 CPPFLAGS="${CONTRIB_INCLUDES}" \