Commit 8a7846e5 authored by Rafaël Carré's avatar Rafaël Carré

Do not misuse RELEASEFLAG

parent 0cdf6fb9
...@@ -27,7 +27,7 @@ VERBOSE = @ ...@@ -27,7 +27,7 @@ VERBOSE = @
GEN = @echo "Generating" $@; GEN = @echo "Generating" $@;
endif endif
ifneq ($(RELEASE),) ifeq ($(RELEASE),1)
ANT_TARGET = release ANT_TARGET = release
VLC_APK=$(SRC)/bin/VLC-release-unsigned.apk VLC_APK=$(SRC)/bin/VLC-release-unsigned.apk
NDK_DEBUG=0 NDK_DEBUG=0
......
...@@ -244,9 +244,10 @@ cd contrib/android ...@@ -244,9 +244,10 @@ cd contrib/android
if [ $# -ne 0 ] && [ "$1" = "release" ]; then if [ $# -ne 0 ] && [ "$1" = "release" ]; then
OPTS="" OPTS=""
EXTRA_CFLAGS="${EXTRA_CFLAGS} -DNDEBUG " EXTRA_CFLAGS="${EXTRA_CFLAGS} -DNDEBUG "
RELEASEFLAG="RELEASE=1" RELEASE=1
else else
OPTS="--enable-debug" OPTS="--enable-debug"
RELEASE=0
fi fi
echo "EXTRA_CFLAGS= -g ${EXTRA_CFLAGS}" >> config.mak echo "EXTRA_CFLAGS= -g ${EXTRA_CFLAGS}" >> config.mak
...@@ -261,13 +262,14 @@ cd ../.. && mkdir -p android && cd android ...@@ -261,13 +262,14 @@ cd ../.. && mkdir -p android && cd android
if [ $# -eq 1 ] && [ "$1" = "jni" ]; then if [ $# -eq 1 ] && [ "$1" = "jni" ]; then
CLEAN="jniclean" CLEAN="jniclean"
RELEASEFLAG="vlc-android/obj/local/armeabi-v7a/libvlcjni.so" TARGET="vlc-android/obj/local/armeabi-v7a/libvlcjni.so"
else else
CLEAN="distclean" CLEAN="distclean"
echo "Bootstraping" echo "Bootstraping"
../bootstrap ../bootstrap
echo "Configuring" echo "Configuring"
${ANDROID_PATH}/configure.sh $OPTS ${ANDROID_PATH}/configure.sh $OPTS
TARGET=
fi fi
echo "Building" echo "Building"
...@@ -287,7 +289,7 @@ export ANDROID_LIBS=${PWD}/android-libs ...@@ -287,7 +289,7 @@ export ANDROID_LIBS=${PWD}/android-libs
export VLC_BUILD_DIR=vlc/android export VLC_BUILD_DIR=vlc/android
make $CLEAN 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 # 3/ Environment script
echo "Generating environment script." echo "Generating environment script."
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment