[Android] Complete the release process

[Jean-Baptiste Kempf]

android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Jun 22 00:08:45 2012 +0200| [d3e1c611ff3516d8f5d273a29c8f87677824b84b] | committer: Jean-Baptiste Kempf

Complete the release process

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

 Makefile   |   11 +++++++++--
 compile.sh |    5 +++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 72d7a29..6221628 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,6 @@ endif
 SRC=vlc-android
 JAVA_SOURCES=$(SRC)/src/org/videolan/vlc/*.java
 JNI_SOURCES=$(SRC)/jni/*.c $(SRC)/jni/*.h
-VLC_APK=$(SRC)/bin/VLC-debug.apk
 LIBVLCJNI=	\
 	$(SRC)/obj/local/$(ARCH)/libvlcjni.so \
 	$(SRC)/obj/local/$(ARCH)/libiomx-ics.so \
@@ -30,11 +29,19 @@ VERBOSE = @
 GEN = @echo "Generating" $@;
 endif
 
+ifneq ($(RELEASE),)
+ANT_TARGET = release
+VLC_APK=$(SRC)/bin/VLC-release-unsigned.apk
+else
+ANT_TARGET = debug
+VLC_APK=$(SRC)/bin/VLC-debug.apk
+endif
+
 $(VLC_APK): $(LIBVLCJNI) $(JAVA_SOURCES)
 	@echo
 	@echo "=== Building $@ for $(ARCH) ==="
 	@echo
-	$(VERBOSE)cd $(SRC) && ant $(ANT_OPTS) debug
+	$(VERBOSE)cd $(SRC) && ant $(ANT_OPTS) $(ANT_TARGET)
 
 VLC_MODULES=`./find_modules.sh $(VLC_BUILD_DIR)`
 
diff --git a/compile.sh b/compile.sh
index 79acc40..394fc1c 100755
--- a/compile.sh
+++ b/compile.sh
@@ -103,9 +103,10 @@ if test -z "${NO_NEON}" -o -n "${TEGRA2}"; then
 fi
 
 # Release or not?
-if [ $1 == "release" ]; then
+if [ $# -ne 0 ] && [ "$1" == "release" ]; then
     OPTS=""
     echo "EXTRA_CFLAGS += -DNDEBUG" >> config.mak
+    MAKEFLAGS="RELEASE=1"
 else
     OPTS="--enable-debug"
 fi
@@ -140,4 +141,4 @@ export ANDROID_LIBS=${PWD}/android-libs
 export VLC_BUILD_DIR=vlc/android
 
 make distclean
-make
+make $MAKEFLAGS