[Android] Do not misuse RELEASEFLAG

[Rafaël Carré]

vlc-ports/android | branch: master | Rafaël Carré <funman at videolan.org> | Mon Dec 23 17:27:02 2013 +0100| [8a7846e573500971e8c49db5efbde4cc9cb09d89] | committer: Rafaël Carré

Do not misuse RELEASEFLAG

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=8a7846e573500971e8c49db5efbde4cc9cb09d89
---

 Makefile   |    2 +-
 compile.sh |    8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 67c99ca..d907dec 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ VERBOSE = @
 GEN = @echo "Generating" $@;
 endif
 
-ifneq ($(RELEASE),)
+ifeq ($(RELEASE),1)
 ANT_TARGET = release
 VLC_APK=$(SRC)/bin/VLC-release-unsigned.apk
 NDK_DEBUG=0
diff --git a/compile.sh b/compile.sh
index 2a5d24e..604dc37 100755
--- a/compile.sh
+++ b/compile.sh
@@ -244,9 +244,10 @@ cd contrib/android
 if [ $# -ne 0 ] && [ "$1" = "release" ]; then
     OPTS=""
     EXTRA_CFLAGS="${EXTRA_CFLAGS} -DNDEBUG "
-    RELEASEFLAG="RELEASE=1"
+    RELEASE=1
 else
     OPTS="--enable-debug"
+    RELEASE=0
 fi
 
 echo "EXTRA_CFLAGS= -g ${EXTRA_CFLAGS}" >> config.mak
@@ -261,13 +262,14 @@ cd ../.. && mkdir -p android && cd android
 
 if [ $# -eq 1 ] && [ "$1" = "jni" ]; then
     CLEAN="jniclean"
-    RELEASEFLAG="vlc-android/obj/local/armeabi-v7a/libvlcjni.so"
+    TARGET="vlc-android/obj/local/armeabi-v7a/libvlcjni.so"
 else
     CLEAN="distclean"
     echo "Bootstraping"
     ../bootstrap
     echo "Configuring"
     ${ANDROID_PATH}/configure.sh $OPTS
+    TARGET=
 fi
 
 echo "Building"
@@ -287,7 +289,7 @@ export ANDROID_LIBS=${PWD}/android-libs
 export VLC_BUILD_DIR=vlc/android
 
 make $CLEAN
-make -j1 TARGET_TUPLE=$TARGET_TUPLE PLATFORM_SHORT_ARCH=$PLATFORM_SHORT_ARCH CXXSTL=$CXXSTL $RELEASEFLAG
+make -j1 TARGET_TUPLE=$TARGET_TUPLE PLATFORM_SHORT_ARCH=$PLATFORM_SHORT_ARCH CXXSTL=$CXXSTL RELEASE=$RELEASE $TARGET
 
 # 3/ Environment script
 echo "Generating environment script."