contrib: fix build for android

contrib/src/main.mak

@@ -93,6 +93,9 @@ endif
 ifdef HAVE_ANDROID
 CC :=  $(HOST)-gcc --sysroot=$(ANDROID_NDK)/platforms/android-9/arch-$(PLATFORM_SHORT_ARCH)
 CXX := $(HOST)-g++ --sysroot=$(ANDROID_NDK)/platforms/android-9/arch-$(PLATFORM_SHORT_ARCH)
+
+#FIXME: configure.sh should already be doing this, and 4.8 should be a variable
+EXTRA_LDFLAGS += -L$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/4.8/libs/$(ANDROID_ABI) -lgnustl_static
 endif
 
 ifdef HAVE_MACOSX

contrib/src/speex/rules.mak

@@ -20,7 +20,6 @@ speex: speex-$(SPEEX_VERSION).tar.gz .sum-speex
 	rm -Rf $@-git $@
 	mkdir -p $@-git
 	$(ZCAT) "$<" | (cd $@-git && tar xv --strip-components=1)
-	$(APPLY) $(SRC)/speex/0001-Add-disable-binaries-option-to-build-only-the-librar.patch
 	$(MOVE)
 
 SPEEX_CONF := --disable-binaries

contrib/src/vpx/rules.mak

@@ -90,7 +90,7 @@ endif
 ifdef HAVE_ANDROID
 # vpx configure.sh overrides our sysroot and it looks for it itself, and
 # uses that path to look for the compiler (which we already know)
-VPX_CONF += --sdk-path=$(shell dirname $(shell which $(HOST)-gcc))
+VPX_CONF += --sdk-path=$(ANDROID_NDK)
 # needed for cpu-features.h
 VPX_CONF += --extra-cflags="-I $(ANDROID_NDK)/sources/cpufeatures/"
 endif

contrib/src/zrtpcpp/nodemo.patch

+--- zrtpcpp/CMakeLists.txt.orig	2014-08-01 13:09:30.402259035 -0400
++++ zrtpcpp/CMakeLists.txt	2014-08-01 13:09:35.089304129 -0400
+@@ -167,10 +167,6 @@
+
+ add_subdirectory(src)
+
+-if (enable_ccrtp)
+-    add_subdirectory(demo)
+-endif()
+-
+ if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/package/)
+     MESSAGE(STATUS "package dir not found")
+     file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/package/)

contrib/src/zrtpcpp/rules.mak

@@ -23,6 +23,7 @@ zrtpcpp: libzrtpcpp-$(ZRTPCPP_VERSION).tar.gz .sum-zrtpcpp
 	$(APPLY) $(SRC)/zrtpcpp/forcegcrypt.patch
 	$(APPLY) $(SRC)/zrtpcpp/threadcbsupdate.patch
 	$(APPLY) $(SRC)/zrtpcpp/standardheader.patch
+	$(APPLY) $(SRC)/zrtpcpp/nodemo.patch
 	$(MOVE)
 
 .zrtpcpp: zrtpcpp toolchain.cmake