Commit ab2cbc03 authored by Thomas Guillem's avatar Thomas Guillem

build: move toolchain hacks before building contribs

parent da1c2026
...@@ -306,6 +306,17 @@ then ...@@ -306,6 +306,17 @@ then
echo "make_standalone_toolchain.py failed" echo "make_standalone_toolchain.py failed"
exit 1 exit 1
fi 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 if [ ! -z "${NDK_FORCE_ARG}" ];then
cp "$ANDROID_NDK/source.properties" "${NDK_TOOLCHAIN_PROPS}" cp "$ANDROID_NDK/source.properties" "${NDK_TOOLCHAIN_PROPS}"
fi fi
...@@ -527,14 +538,6 @@ else ...@@ -527,14 +538,6 @@ else
VLC_LDFLAGS="${VLC_LDFLAGS} -L${NDK_LIB_DIR} -landroid_support" VLC_LDFLAGS="${VLC_LDFLAGS} -L${NDK_LIB_DIR} -landroid_support"
fi 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 if [ ! -e ./config.h -o "$RELEASE" = 1 ]; then
CPPFLAGS="${CONTRIB_INCLUDES}" \ CPPFLAGS="${CONTRIB_INCLUDES}" \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment