Commit 46bebeaa authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

Revert "compile: move ndk detection up"

This reverts commit bda4beab.
This is unnecessary in the end, and breaks 64 bits builds
parent cd868ba0
......@@ -231,20 +231,6 @@ VLC_MODULE_BLACKLIST="
.dummy
"
# try to detect NDK version
REL=$(grep -o '^Pkg.Revision.*[0-9]*.*' $ANDROID_NDK/source.properties |cut -d " " -f 3 | cut -d "." -f 1)
if [ "$REL" -ge 13 ]; then
if [ "${HAVE_64}" = 1 ];then
ANDROID_API=21
else
ANDROID_API=9
fi
else
echo "You need the NDKv13 or later"
exit 1
fi
#########
# FLAGS #
#########
......@@ -283,6 +269,20 @@ else
exit 2
fi
# try to detect NDK version
REL=$(grep -o '^Pkg.Revision.*[0-9]*.*' $ANDROID_NDK/source.properties |cut -d " " -f 3 | cut -d "." -f 1)
if [ "$REL" -ge 13 ]; then
if [ "${HAVE_64}" = 1 ];then
ANDROID_API=21
else
ANDROID_API=9
fi
else
echo "You need the NDKv13 or later"
exit 1
fi
NDK_FORCE_ARG=
NDK_TOOLCHAIN_DIR=${PWD}/toolchains/${PLATFORM_SHORT_ARCH}
NDK_TOOLCHAIN_PROPS=${NDK_TOOLCHAIN_DIR}/source.properties
......
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