Commit c8dccbaf authored by Thomas Guillem's avatar Thomas Guillem

Revert "build: move ndk fixup into configure.sh"

This reverts commit 0a79ed07.
parent 0a79ed07
...@@ -314,6 +314,23 @@ else ...@@ -314,6 +314,23 @@ else
TARGET= TARGET=
fi fi
# ANDROID NDK FIXUP (BLAME GOOGLE)
config_undef ()
{
sed -i 's,#define '$1' 1,/\* #undef '$1' \*/,' config.h
}
if [ ${ANDROID_ABI} = "x86" -a ${ANDROID_API} != "android-21" ] ; then
# NDK x86 libm.so has nanf symbol but no nanf definition, we don't known if
# intel devices has nanf. Assume they don't have it.
config_undef HAVE_NANF
fi
if [ ${ANDROID_API} = "android-21" ] ; then
# android-21 has empty sys/shm.h headers that triggers shm detection but it
# doesn't have any shm functions and/or symbols. */
config_undef HAVE_SYS_SHM_H
fi
echo "Building" echo "Building"
make $MAKEFLAGS make $MAKEFLAGS
......
...@@ -113,20 +113,3 @@ sh $VLC_SOURCEDIR/configure --host=$TARGET_TUPLE --build=x86_64-unknown-linux $E ...@@ -113,20 +113,3 @@ sh $VLC_SOURCEDIR/configure --host=$TARGET_TUPLE --build=x86_64-unknown-linux $E
--disable-x264 \ --disable-x264 \
--disable-schroedinger --disable-dirac \ --disable-schroedinger --disable-dirac \
$* $*
# ANDROID NDK FIXUP (BLAME GOOGLE)
config_undef ()
{
sed -i 's,#define '$1' 1,/\* #undef '$1' \*/,' config.h
}
if [ ${ANDROID_ABI} = "x86" -a ${ANDROID_API} != "android-21" ] ; then
# NDK x86 libm.so has nanf symbol but no nanf definition, we don't known if
# intel devices has nanf. Assume they don't have it.
config_undef HAVE_NANF
fi
if [ ${ANDROID_API} = "android-21" ] ; then
# android-21 has empty sys/shm.h headers that triggers shm detection but it
# doesn't have any shm functions and/or symbols. */
config_undef HAVE_SYS_SHM_H
fi
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