[Android] Build contribs after setting flags

[Rafaël Carré]

android | branch: master | Rafaël Carré <funman at videolan.org> | Wed Aug  8 16:27:52 2012 +0200| [fc24709cd381bbcd55fb2507e2d9610156c55af8] | committer: Rafaël Carré

Build contribs after setting flags

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

 compile.sh |   46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/compile.sh b/compile.sh
index 5f9200e..bdc7241 100755
--- a/compile.sh
+++ b/compile.sh
@@ -125,29 +125,6 @@ EOF
     fi
 fi
 
-echo "Building the contribs"
-mkdir -p contrib/android
-cd contrib/android
-../bootstrap --host=${TARGET_TUPLE} --disable-disc --disable-sout --enable-small \
-    --disable-sdl \
-    --disable-SDL_image \
-    --disable-fontconfig \
-    --disable-zvbi \
-    --disable-kate \
-    --disable-caca \
-    --disable-gettext \
-    --disable-mpcdec \
-    --disable-upnp \
-    --disable-gme \
-    --disable-tremor \
-    --disable-vorbis \
-    --disable-sidplay2 \
-    --disable-samplerate \
-    --disable-faad2 \
-    --enable-iconv
-
-# TODO: mpeg2, theora
-
 if [ ${ANDROID_ABI} = "armeabi-v7a" ] ; then
     if test -z "${NO_NEON}" ; then
         EXTRA_CFLAGS="-mfpu=neon -mcpu=cortex-a8"
@@ -177,6 +154,29 @@ fi
 EXTRA_CFLAGS="${EXTRA_CFLAGS} -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/include"
 EXTRA_CFLAGS="${EXTRA_CFLAGS} -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/libs/${ANDROID_ABI}/include"
 
+echo "Building the contribs"
+mkdir -p contrib/android
+cd contrib/android
+../bootstrap --host=${TARGET_TUPLE} --disable-disc --disable-sout --enable-small \
+    --disable-sdl \
+    --disable-SDL_image \
+    --disable-fontconfig \
+    --disable-zvbi \
+    --disable-kate \
+    --disable-caca \
+    --disable-gettext \
+    --disable-mpcdec \
+    --disable-upnp \
+    --disable-gme \
+    --disable-tremor \
+    --disable-vorbis \
+    --disable-sidplay2 \
+    --disable-samplerate \
+    --disable-faad2 \
+    --enable-iconv
+
+# TODO: mpeg2, theora
+
 
 # Release or not?
 if [ $# -ne 0 ] && [ "$1" == "release" ]; then