Commit 570c1a4d authored by Rafaël Carré's avatar Rafaël Carré

Revert "For now, bypass live555"

This reverts commit 0d64504c.
parent 03a94248
...@@ -46,8 +46,7 @@ mkdir contrib/android; cd contrib/android ...@@ -46,8 +46,7 @@ mkdir contrib/android; cd contrib/android
--disable-caca \ --disable-caca \
--disable-gettext \ --disable-gettext \
--disable-mpcdec \ --disable-mpcdec \
--disable-sidplay2 \ --disable-sidplay2
--disable-live555
make fetch make fetch
make make
......
...@@ -30,9 +30,8 @@ LOCAL_LDLIBS := -L$(VLC_CONTRIB)/lib \ ...@@ -30,9 +30,8 @@ LOCAL_LDLIBS := -L$(VLC_CONTRIB)/lib \
-lavformat -lavcodec -lswscale -lavutil -lpostproc \ -lavformat -lavcodec -lswscale -lavutil -lpostproc \
-lmpeg2 -lpng -ldvbpsi -llog -la52 -lebml -lmatroska -ltag \ -lmpeg2 -lpng -ldvbpsi -llog -la52 -lebml -lmatroska -ltag \
-lgsm -lopenjpeg -lgme -lupnp -lixml -lthreadutil -lxml2 -lsamplerate \ -lgsm -lopenjpeg -lgme -lupnp -lixml -lthreadutil -lxml2 -lsamplerate \
-lliveMedia -lUsageEnvironment -lBasicUsageEnvironment -lgroupsock \
$(CPP_STATIC) $(CPP_STATIC)
#-lliveMedia -lUsageEnvironment -lBasicUsageEnvironment -lgroupsock \
# until live555 is fixed
include $(BUILD_SHARED_LIBRARY) 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