[Android] [PATCH 3/6] contrib: Don't hardcode Android ABI tag in live555 build script

[Rafaël Carré]

Le 2012-07-15 22:28, Edward Wang a écrit :
> ---
>  contrib/src/live555/rules.mak |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
> index 280816c..d8d9274 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-$(ANDROID_ARCH_TAG)/usr/include%' -i.orig config.linux

ANDROID_ARCH_TAG is not defined (unless I missed it in previous patches)

>  	patch -p0 < $(SRC)/live555/android.patch
>  endif
>  	mv live $@
>