[Android] [PATCH 2/4] contrib: Allow live555 build on Android x86

[Edward Wang]

This package demands exceptions, but if it is enabled globally, it conflicts with other packages.
---
 contrib/src/live555/rules.mak |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index 71d1ad6..73b1415 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -29,6 +29,11 @@ LIVE_TARGET := freebsd
 endif
 endif
 
+LIVE_EXTRA_CFLAGS := $(EXTRA_CFLAGS)
+ifdef HAVE_ANDROID
+LIVE_EXTRA_CFLAGS += -fexceptions
+endif
+
 live555: $(LIVE555_FILE) .sum-live555
 	rm -Rf live
 	$(UNPACK)
@@ -41,7 +46,7 @@ endif
 	cd live && sed -i.orig \
 		-e 's%$(CXX)%$(CXX)\ $(EXTRA_LDFLAGS)%' config.macosx
 	cd live && sed -i.orig \
-		-e 's%^\(COMPILE_OPTS.*\)$$%\1 '"$(EXTRA_CFLAGS)%" config.*
+		-e 's%^\(COMPILE_OPTS.*\)$$%\1 '"$(LIVE_EXTRA_CFLAGS)%" config.*
 	cd live && sed -e 's%-D_FILE_OFFSET_BITS=64%-D_FILE_OFFSET_BITS=64\ -fPIC\ -DPIC%' -i.orig config.linux
 ifdef HAVE_ANDROID
 	cd live && sed -e 's%-DPIC%-DPIC -DNO_SSTREAM=1 -DLOCALE_NOT_USED -I$(ANDROID_NDK)/platforms/android-9/arch-$(PLATFORM_SHORT_ARCH)/usr/include%' -i.orig config.linux
-- 
1.7.5.4