Revert "For now, bypass live555"

This reverts commit 0d64504c.

Revert "For now, bypass live555"
This reverts commit 0d64504c.
570c1a4d · Rafaël Carré · 03a94248 · 570c1a4d · 570c1a4d
Commit 570c1a4d authored Jan 23, 2012 by Rafaël Carré
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

compile.sh compile.sh +1 -2

vlc-android/jni/Android.mk vlc-android/jni/Android.mk +1 -2

No files found.
--- a/compile.sh
+++ b/compile.sh
@@ -46,8 +46,7 @@ mkdir contrib/android; cd contrib/android
    --disable-caca \
    --disable-gettext \
    --disable-mpcdec \
-    --disable-sidplay2 \
-    --disable-live555
+    --disable-sidplay2

 make fetch
 make

--- a/vlc-android/jni/Android.mk
+++ b/vlc-android/jni/Android.mk
@@ -30,9 +30,8 @@ LOCAL_LDLIBS := -L$(VLC_CONTRIB)/lib \
 	-lavformat -lavcodec -lswscale -lavutil -lpostproc \
 	-lmpeg2 -lpng -ldvbpsi -llog -la52 -lebml -lmatroska -ltag \
 	-lgsm -lopenjpeg -lgme -lupnp -lixml -lthreadutil -lxml2 -lsamplerate \
+	-lliveMedia -lUsageEnvironment -lBasicUsageEnvironment -lgroupsock \
 	$(CPP_STATIC)
-#-lliveMedia -lUsageEnvironment -lBasicUsageEnvironment -lgroupsock \
-# until live555 is fixed

 include $(BUILD_SHARED_LIBRARY)