[Android] copy uchar.h in our contrib include folder, not in the toolchain

[Steve Lhomme]

vlc-android | branch: master | Steve Lhomme <robux4 at videolabs.io> | Tue Oct 18 12:42:50 2016 +0200| [3acbace0f4c414f9ec9d592b50b8d390bd7627c9] | committer: Thomas Guillem

copy uchar.h in our contrib include folder, not in the toolchain

Signed-off-by: Thomas Guillem <thomas at gllm.fr>

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

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

diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index acb2fc2..8241031 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -308,10 +308,6 @@ then
 fi
 
 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
@@ -477,6 +473,13 @@ fi
 echo "Building the contribs"
 mkdir -p contrib/contrib-android-${TARGET_TUPLE}
 
+# don't use the dummy uchar.c
+if [ ! -f contrib/${TARGET_TUPLE}/include/uchar.h ]; then
+    mkdir -p contrib/${TARGET_TUPLE}/include
+    cp ${ANDROID_NDK}/platforms/android-24/arch-${PLATFORM_SHORT_ARCH}/usr/include/uchar.h \
+        contrib/${TARGET_TUPLE}/include/uchar.h
+fi
+
 gen_pc_file() {
     echo "Generating $1 pkg-config file"
     echo "Name: $1