[0.10] gst-plugins-base: Android, Add explicit path for zlib

Tim Müller tpm at kemper.freedesktop.org
Tue Jan 17 18:02:22 PST 2012


Module: gst-plugins-base
Branch: 0.10
Commit: 8a61dc539921d5510af63e100d27ddf36fc6a978
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=8a61dc539921d5510af63e100d27ddf36fc6a978

Author: Reynaldo H. Verdejo Pinochet <reynaldo at collabora.com>
Date:   Fri Jan 13 16:57:15 2012 -0300

Android, Add explicit path for zlib

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

---

 Android.mk |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

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 && \



More information about the gstreamer-commits mailing list