[Android] Allow to build for releases

Jean-Baptiste Kempf git at videolan.org
Thu Jun 21 23:38:20 CEST 2012


android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Jun 22 01:34:16 2012 +0200| [9e04ad6ffcc4f76b217b94a6481d5f7518dd9f02] | committer: Jean-Baptiste Kempf

Allow to build for releases

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

 compile.sh   |   11 ++++++++++-
 configure.sh |    1 -
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/compile.sh b/compile.sh
index 2116491..79acc40 100755
--- a/compile.sh
+++ b/compile.sh
@@ -19,6 +19,7 @@ export NO_NDK_V7=1
 or if you are sure you have NDK v7:
 export NO_NDK_V7=0
 
+If you plan to use a release build, run 'compile.sh release'
 EOF
 
 if [ -z "$ANDROID_NDK" -o -z "$ANDROID_SDK" ]; then
@@ -101,6 +102,14 @@ if test -z "${NO_NEON}" -o -n "${TEGRA2}"; then
     echo "NOTHUMB := -marm" >> config.mak
 fi
 
+# Release or not?
+if [ $1 == "release" ]; then
+    OPTS=""
+    echo "EXTRA_CFLAGS += -DNDEBUG" >> config.mak
+else
+    OPTS="--enable-debug"
+fi
+
 make fetch
 make
 
@@ -112,7 +121,7 @@ if test ! -s "../configure" ; then
 fi
 
 echo "Configuring"
-../../configure.sh
+../../configure.sh $OPTS
 
 echo "Building"
 make
diff --git a/configure.sh b/configure.sh
index 3ff6a69..029698c 100755
--- a/configure.sh
+++ b/configure.sh
@@ -55,7 +55,6 @@ sh $VLC_SOURCEDIR/configure --host=arm-linux-androideabi --build=x86_64-unknown-
                 --enable-opensles \
                 --enable-audiotrack \
                 --enable-android-surface \
-                --enable-debug \
                 --enable-mkv \
                 --enable-taglib \
                 --enable-iomx \



More information about the Android mailing list