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

Rafaël Carré git at videolan.org
Sun Aug 11 17:54:25 CEST 2013


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



More information about the Android mailing list