[Android] Show armv5/armv6 message only for ARM builds
Rafaël Carré
git at videolan.org
Sat May 11 16:18:25 CEST 2013
vlc-ports/android | branch: master | Rafaël Carré <funman at videolan.org> | Sat May 11 16:17:37 2013 +0200| [702ea35edf3495b010d64bb80adef7cf77e47048] | committer: Rafaël Carré
Show armv5/armv6 message only for ARM builds
Remove mention of google qemu since it supports armv7 these days
> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=702ea35edf3495b010d64bb80adef7cf77e47048
---
compile.sh | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/compile.sh b/compile.sh
index 12bc0fc..b353ef2 100755
--- a/compile.sh
+++ b/compile.sh
@@ -37,16 +37,6 @@ esac
export GCCVER
export CXXSTL
-# XXX : important!
-cat << EOF
-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
-
# Set up ABI variables
if [ ${ANDROID_ABI} = "x86" ] ; then
TARGET_TUPLE="i686-linux-android"
@@ -65,6 +55,16 @@ else
PLATFORM_SHORT_ARCH="arm"
fi
+# XXX : important!
+[ "$HAVE_ARM" = 1 ] && cat << EOF
+For an ARMv6 device without FPU:
+$ export NO_FPU=1
+For an ARMv5 device:
+$ export NO_ARMV6=1
+
+If you plan to use a release build, run 'compile.sh release'
+EOF
+
export TARGET_TUPLE
export PATH_HOST
export HAVE_ARM
More information about the Android
mailing list