Commit 18c8c228 authored by Sébastien Toque's avatar Sébastien Toque

compile.sh: add "jni" argument

the goal is to build vlc + libvlcjni only.
This is very useful if nothing has changed in contribs/configure and when using eclipse for java.
parent fbfdaf6a
......@@ -96,14 +96,18 @@ $(LIBVLCJNI): $(JNI_SOURCES) $(LIBVLCJNI_H) $(PRIVATE_LIBS)
apkclean:
rm -f $(VLC_APK)
clean:
cd $(SRC) && rm -rf gen libs obj bin $(VLC_APK)
rm -rf java-libs/*/gen java-libs/*/bin
lightclean:
cd $(SRC) && rm -rf libs obj bin $(VLC_APK)
rm -f $(PRIVATE_LIBDIR)/*.so $(PRIVATE_LIBDIR)/*.c
distclean: clean
clean: lightclean
rm -rf $(SRC)/gen java-libs/*/gen java-libs/*/bin
jniclean: lightclean
rm -f $(LIBVLCJNI) $(LIBVLCJNI_H)
distclean: clean jniclean
install: $(VLC_APK)
@echo "=== Installing VLC on device ==="
adb wait-for-device
......@@ -126,4 +130,4 @@ apkclean-run: apkclean build-and-run
distclean-run: distclean build-and-run
adb logcat -c
.PHONY: clean distclean distclean-run apkclean apkclean-run install run build-and-run
.PHONY: lightclean clean jniclean distclean distclean-run apkclean apkclean-run install run build-and-run
......@@ -192,11 +192,16 @@ make $MAKEFLAGS
cd ../.. && mkdir -p android && cd android
echo "Bootstraping"
../bootstrap
echo "Configuring"
../../configure.sh $OPTS
if [ $# -eq 1 ] && [ "$1" = "jni" ]; then
CLEAN="jniclean"
RELEASEFLAG="vlc-android/obj/local/armeabi-v7a/libvlcjni.so"
else
CLEAN="distclean"
echo "Bootstraping"
../bootstrap
echo "Configuring"
../../configure.sh $OPTS
fi
echo "Building"
make $MAKEFLAGS
......@@ -214,7 +219,7 @@ export ANDROID_SYS_HEADERS_ICS=${PWD}/android-headers-ics
export ANDROID_LIBS=${PWD}/android-libs
export VLC_BUILD_DIR=vlc/android
make distclean
make $CLEAN
make -j1 TARGET_TUPLE=$TARGET_TUPLE PLATFORM_SHORT_ARCH=$PLATFORM_SHORT_ARCH CXXSTL=$CXXSTL $RELEASEFLAG
# 3/ 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