[Android] Fix fc24709cd3

Rafaël Carré git at videolan.org
Thu Aug 9 15:14:43 CEST 2012


android | branch: master | Rafaël Carré <funman at videolan.org> | Thu Aug  9 15:13:37 2012 +0200| [e28556cddc61e91fac30fd6cd3b7cca506d5347a] | committer: Rafaël Carré

Fix fc24709cd3

Complete contrib flags after bootstrap

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

 compile.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compile.sh b/compile.sh
index bdc7241..b9b5e25 100755
--- a/compile.sh
+++ b/compile.sh
@@ -132,7 +132,6 @@ if [ ${ANDROID_ABI} = "armeabi-v7a" ] ; then
         EXTRA_CFLAGS="-mfpu=vfpv3-d16 -mcpu=cortex-a9"
     fi
     EXTRA_CFLAGS="${EXTRA_CFLAGS} -mthumb -mfloat-abi=softfp"
-    echo "NOTHUMB := -marm" >> config.mak
 elif [ ${ANDROID_ABI} = "armeabi" ] ; then
     export NO_NEON=1
     if [ -n "${NO_ARMV6}" ]; then
@@ -177,6 +176,7 @@ cd contrib/android
 
 # TODO: mpeg2, theora
 
+[ ${ANDROID_ABI} = "armeabi-v7a" ] && echo "NOTHUMB := -marm" >> config.mak
 
 # Release or not?
 if [ $# -ne 0 ] && [ "$1" == "release" ]; then



More information about the Android mailing list