Commit beb84973 authored by Edward Wang's avatar Edward Wang Committed by Konstantin Pavlov

contrib: force HAVE_NEON only on ARMv7

Since NO_NEON is not used anymore, leaving it undefined on ARMv6 will result in HAVE_NEON showing up, resulting in crashes.

ARMv7 Android builds are now built to tegra2 with a special dynamic NEON loader for libav.
Signed-off-by: Konstantin Pavlov's avatarKonstantin Pavlov <>
parent bab72eae
......@@ -191,7 +191,7 @@ check_android_sdk()
add_make "ANDROID_NDK := ${ANDROID_NDK}"
[ -z "${ANDROID_ABI}" ] && echo "You must set ANDROID_ABI environment variable" && exit 1
add_make "ANDROID_ABI := ${ANDROID_ABI}"
test -z "${NO_NEON}" && add_make_enabled "HAVE_NEON"
[ ${ANDROID_ABI} = "armeabi-v7a" ] && add_make_enabled "HAVE_NEON"
[ ${ANDROID_ABI} = "armeabi-v7a" ] && add_make_enabled "HAVE_ARMV7A"
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