From: Reynaldo H. Verdejo Pinochet <reynaldo@collabora.com>
Date: Fri, 13 Jan 2012 19:57:15 +0000 (-0300)
Subject: Android, Add explicit path for zlib
X-Git-Tag: RELEASE-0.11.2~2^2~36
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d32ce909f1366a2f067a8de7e005329840a1629e;p=platform%2Fupstream%2Fgst-plugins-base.git

Android, Add explicit path for zlib

This change fixes building gst-libs/gst/tag/ code with
the Android buildsystem.
---

diff --git a/Android.mk b/Android.mk
index a78bd69..e6a07b6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -67,6 +67,7 @@ GST_PLUGINS_BASE_BUILT_SOURCES := 						\
 
 ifneq ($(NDK_BUILD), true)
 GST_PLUGINS_BASE_BUILT_SOURCES += ext/vorbis/Android.mk
+ZLIB_CFLAGS = -I $(abspath $(GST_PLUGINS_BASE_TOP)/../../zlib)
 endif
 
 GST_PLUGINS_BASE_BUILT_SOURCES := $(patsubst %, $(abspath $(GST_PLUGINS_BASE_TOP))/%, $(GST_PLUGINS_BASE_BUILT_SOURCES))
@@ -85,6 +86,7 @@ gst-plugins-base-configure:
 	PKG_CONFIG_TOP_BUILD_DIR=/ \
 	IVORBIS_CFLAGS="-I$(TOP)/external/tremolo -DTREMOR" \
 	IVORBIS_LIBS="-lvorbisidec" \
+	ZLIB_CFLAGS="$(ZLIB_CFLAGS)" \
 	$(abspath $(GST_PLUGINS_BASE_TOP))/$(CONFIGURE) --host=arm-linux-androideabi \
 	--prefix=/system --disable-orc --disable-gio --enable-ivorbis \
 	--disable-valgrind --disable-gtk-doc && \