[Android] compile.sh: add a flag for ARMv5

Edward Wang git at videolan.org
Mon Jun 25 04:11:40 CEST 2012


android | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Sun Jun 24 22:11:15 2012 -0400| [4a8bcf577a30cc369cc4e62294013a4fbdf72fdc] | committer: Edward Wang

compile.sh: add a flag for ARMv5

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

 compile.sh |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/compile.sh b/compile.sh
index 4ee4ecc..452e8dd 100755
--- a/compile.sh
+++ b/compile.sh
@@ -15,10 +15,12 @@ fi
 
 # XXX : important!
 cat << EOF
-For an ARMv7-A device without NEON or the emulator, you need a build without NEON:
+For an ARMv7-A device without NEON, you need a build without NEON:
 $ export NO_NEON=1
 For an ARMv6 device without FPU, you need a build without FPU:
 $ export NO_FPU=1
+For an ARMv5 device or the Android emulator, you need an ARMv5 build:
+$ export NO_ARMV6=1
 
 If you plan to use a release build, run 'compile.sh release'
 EOF
@@ -98,10 +100,14 @@ if [ ${ANDROID_ABI} = "armeabi-v7a" ] ; then
     echo "NOTHUMB := -marm" >> config.mak
 elif [ ${ANDROID_ABI} = "armeabi" ] ; then
     export NO_NEON=1
-    if test -z "${NO_FPU}" ; then
-        EXTRA_CFLAGS="-mfpu=vfp -mcpu=arm1136jf-s -mfloat-abi=softfp"
+    if [ -n "${NO_ARMV6}" ]; then
+        EXTRA_CFLAGS="-march=armv5te -mtune=arm9tdmi -msoft-float"
     else
-        EXTRA_CFLAGS="-march=armv6j -mtune=arm1136j-s -msoft-float"
+        if [ -n "${NO_FPU}" ]; then
+            EXTRA_CFLAGS="-march=armv6j -mtune=arm1136j-s -msoft-float"
+        else
+            EXTRA_CFLAGS="-mfpu=vfp -mcpu=arm1136jf-s -mfloat-abi=softfp"
+        fi
     fi
 else
     echo "Unknown ABI. Die, die, die!"



More information about the Android mailing list