Commit adeef81d authored by Rafaël Carré's avatar Rafaël Carré

use /contrib

bonus libs: gsm openjpeg gme upnp samplerate
removed: libdca
parent 1cd9c571
......@@ -31,7 +31,7 @@ $(LIBVLCJNI): $(JNI_SOURCES) $(LIBVLCJNI_H)
@if [ -z "$(ANDROID_NDK)" ]; then echo "ANDROID_NDK not defined" ; exit 1; fi
@echo "=== Building libvlcjni with$${NO_NEON:+out} neon ==="
@if [ -z "$(VLC_SRC_DIR)" ] ; then VLC_SRC_DIR=./vlc; fi ; \
if [ -z "$(VLC_CONTRIB)" ] ; then VLC_CONTRIB="$$VLC_SRC_DIR/extras/contrib/build"; fi ; \
if [ -z "$(VLC_CONTRIB)" ] ; then VLC_CONTRIB="$$VLC_SRC_DIR/contrib/arm-linux-androideabi"; fi ; \
vlc_modules="$(VLC_MODULES)" ; \
if [ `echo "$(VLC_BUILD_DIR)" | head -c 1` != "/" ] ; then \
vlc_modules="`echo $$vlc_modules|sed \"s|$(VLC_BUILD_DIR)|../$(VLC_BUILD_DIR)|g\"`" ; \
......
......@@ -37,7 +37,7 @@ echo "Fetching Android libraries for linking"
# fine, since the symbols used should be available on most of them.
if [ ! -f "update-cm-7.1.0.1-NS-signed.zip" ]; then
curl -O http://mirror.sea.tdrevolution.net/cm/stable/gingerbread/update-cm-7.1.0.1-NS-signed.zip
unzip update-cm-7.1.0.1-NS-signed.zip system/lib/*
unzip update-cm-7.1.0.1-NS-signed.zip system/lib/\*
mv system/lib android-libs
rmdir system
fi
......@@ -58,7 +58,23 @@ cd vlc
$GIT am ../patches/*.patch || $GIT am --abort
echo "Building the contribs"
cd extras/contrib && ./bootstrap -t arm-eabi -d android && make
mkdir contrib/android; cd contrib/android
../bootstrap --host=arm-linux-androideabi --disable-disc --disable-sout \
--disable-sdl \
--disable-SDL_image \
--disable-fontconfig \
--disable-ass \
--disable-freetyp2 \
--disable-fribidi \
--disable-zvbi \
--disable-kate \
--disable-caca \
--disable-gettext \
--disable-mpcdec \
--disable-sidplay2
make fetch
make
cd ../.. && mkdir -p android && cd android
......
......@@ -28,8 +28,10 @@ LOCAL_LDLIBS := -L$(VLC_CONTRIB)/lib \
$(VLC_BUILD_DIR)/src/.libs/libvlccore.a \
-ldl -lz -lm -logg -lvorbisenc -lvorbis -lFLAC -lspeex -lspeexdsp -ltheora \
-lavformat -lavcodec -lswscale -lavutil -lpostproc \
-lmpeg2 -lpng -ldca -ldvbpsi -ltwolame -lkate -llog -la52 \
-lebml -lmatroska -ltag $(CPP_STATIC)
-lmpeg2 -lpng -ldvbpsi -llog -la52 \
-lebml -lmatroska -ltag -lgsm -lopenjpeg -lgme -lupnp -lixml -lthreadutil -lxml2 \
-lsamplerate \
$(CPP_STATIC)
include $(BUILD_SHARED_LIBRARY)
......
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