For now, bypass live555

Signed-off-by: Sébastien Toque <xilasz@gmail.com>

For now, bypass live555
Signed-off-by: Sébastien Toque <xilasz@gmail.com>
0d64504c · Edward Wang · Sébastien Toque · 4909022a · 0d64504c · 0d64504c
Commit 0d64504c authored Jan 21, 2012 by Edward Wang Committed by Sébastien Toque Jan 21, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

HOWTO HOWTO +2 -1

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

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

 make fetch
 make

--- a/vlc-android/jni/Android.mk
+++ b/vlc-android/jni/Android.mk
@@ -30,8 +30,9 @@ 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)