[Android] configure.sh: Support setting NO_NEON to 0

Edward Wang git at videolan.org
Thu Jul 12 03:49:34 CEST 2012


android | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Wed Jul 11 21:48:27 2012 -0400| [f347cc0232d5376da36715212b83552b5a4d601b] | committer: Edward Wang

configure.sh: Support setting NO_NEON to 0

The previous behaviour assumed that any string would be "1" without checking for zero, leading to deceptive behaviour.

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

 configure.sh |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/configure.sh b/configure.sh
index d8cb148..c5dd97f 100755
--- a/configure.sh
+++ b/configure.sh
@@ -16,10 +16,14 @@ CFLAGS="-g -O2 -mlong-calls -fstrict-aliasing -funsafe-math-optimizations"
 LDFLAGS="-Wl,-Bdynamic,-dynamic-linker=/system/bin/linker -Wl,--no-undefined"
 
 if [ -z "$NO_NEON" ]; then
+    NO_NEON=0
+fi
+
+if [ $NO_NEON -gt 0 ]; then
+    EXTRA_PARAMS=" --disable-neon"
+else
     EXTRA_PARAMS=" --enable-neon"
     LDFLAGS="$LDFLAGS -Wl,--fix-cortex-a8"
-else
-    EXTRA_PARAMS=" --disable-neon"
 fi
 
 CPPFLAGS="-I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/include -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/libs/${ANDROID_ABI}/include"



More information about the Android mailing list