[vlc-commits] contrib: force HAVE_NEON only on ARMv7

[Edward Wang]

vlc | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Wed Nov 21 23:11:25 2012 +0000| [beb8497347252a91195c5192f70c2c4a6dac9aba] | committer: 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 <thresh at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=beb8497347252a91195c5192f70c2c4a6dac9aba
---

 contrib/bootstrap |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/bootstrap b/contrib/bootstrap
index 0567a57..b8d88c9 100755
--- 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"
 }