Commit d3e1c611 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Complete the release process

parent 1de7c78d
......@@ -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)`
......
......@@ -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
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