From 570c1a4d9ebe85502ca51d84e5393cee3388902c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= <funman@videolan.org>
Date: Mon, 23 Jan 2012 13:14:43 -0500
Subject: [PATCH] Revert "For now, bypass live555"

This reverts commit 0d64504c4cfe7c5ca35fd8741785155ea0ab5054.
---
 compile.sh                 | 3 +--
 vlc-android/jni/Android.mk | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/compile.sh b/compile.sh
index 6d51ef66d..9c9b12f4d 100755
--- 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
diff --git a/vlc-android/jni/Android.mk b/vlc-android/jni/Android.mk
index a879f1261..83179f35e 100644
--- 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)
 
-- 
GitLab