[Android] Do not build zlib contrib as it's already available on the system

[Rafaël Carré]

For this to work you need:

cd vlc/contrib
rm -f */lib/libz.a */include/zlib.h
rm -fr android/png

So png is rebuilt with the old API since it will only see the old
headers of the NDK

Le 11/08/2013 17:54, Rafaël Carré a écrit :
> vlc-ports/android | branch: master | Rafaël Carré <funman at videolan.org> | Sun Aug 11 17:31:54 2013 +0200| [04008f4aa200ed3cb6147a0624510f248890d05d] | committer: Rafaël Carré
> 
> Do not build zlib contrib as it's already available on the system
> 
> If we do, libpng will pick up the newer headers but still link to the old version of the NDK
> --disable-zlib is not enough as some packages depend on it
> 
>> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=04008f4aa200ed3cb6147a0624510f248890d05d
> ---
> 
>  compile.sh |    2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/compile.sh b/compile.sh
> index c815a3b..6681752 100755
> --- a/compile.sh
> +++ b/compile.sh
> @@ -206,6 +206,8 @@ echo "EXTRA_CFLAGS= -g ${EXTRA_CFLAGS}" >> config.mak
>  export VLC_EXTRA_CFLAGS="${EXTRA_CFLAGS}"
>  
>  make fetch
> +# We already have zlib available
> +mkdir -p zlib; touch .zlib
>  make $MAKEFLAGS
>  
>  cd ../.. && mkdir -p android && cd android