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 <thresh@videolan.org>

diff --git a/contrib/bootstrap b/contrib/bootstrap
index 0567a57d0166702bb96d41e215cb26b45b0c02fd..b8d88c9b85b2779b11c9fc41633f501e5311f7b6 100755 (executable)
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -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"
 }