Commit b0505fee authored by Thomas Guillem's avatar Thomas Guillem

build: handle ANDROID ABI/NDK in one place

And remove aggressive "Die, die, die!" log.
parent ca72181c
......@@ -63,8 +63,12 @@ elif [ "${ANDROID_ABI}" = "armeabi-v7a" ] ; then
HAVE_ARM=1
PLATFORM_SHORT_ARCH="arm"
else
echo "Unknown ABI: '${ANDROID_ABI}'. Die, die, die!"
exit 2
echo "Please pass the ANDROID ABI to the correct architecture, using
compile-libvlc.sh -a ARCH
ARM: (armeabi-v7a|arm)
ARM64: (arm64-v8a|arm64)
X86: x86, x86_64"
exit 1
fi
# try to detect NDK version
......
......@@ -25,20 +25,6 @@ while [ $# -gt 0 ]; do
shift
done
if [ -z "$ANDROID_NDK" ]; then
echo "Please set the ANDROID_NDK environment variable with its path."
exit 1
fi
if [ -z "$ANDROID_ABI" ]; then
echo "Please pass the ANDROID ABI to the correct architecture, using
compile-libvlc.sh -a ARCH
ARM: (armeabi-v7a|arm)
ARM64: (arm64-v8a|arm64)
X86: x86, x86_64"
exit 1
fi
AVLC_SOURCED=1 . ./compile-libvlc.sh
avlc_make_toolchain
......
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