From 2c26061ca8bd84ace8b8904f902157975ebd5229 Mon Sep 17 00:00:00 2001 From: Edward Wang Date: Wed, 25 Jul 2012 20:31:22 -0400 Subject: [PATCH] contrib: Don't hardcode Android ABI tag in live555 build script MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafaël Carré --- contrib/src/live555/rules.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak index 280816c026..71d1ad65ae 100644 --- a/contrib/src/live555/rules.mak +++ b/contrib/src/live555/rules.mak @@ -44,7 +44,7 @@ endif -e 's%^\(COMPILE_OPTS.*\)$$%\1 '"$(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-arm/usr/include%' -i.orig config.linux + 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 patch -p0 < $(SRC)/live555/android.patch endif mv live $@ -- 2.11.4.GIT