summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReynaldo H. Verdejo Pinochet <reynaldo@collabora.com>2012-01-13 16:57:15 -0300
committerReynaldo H. Verdejo Pinochet <reynaldo@collabora.com>2012-01-13 16:57:15 -0300
commitd32ce909f1366a2f067a8de7e005329840a1629e (patch)
tree719657f511c90212db90e31e9f506eb36bc0637e
parent87bb5dddb2bdae3fb9fc359776e81a3dbd9d69bc (diff)
Android, Add explicit path for zlib
This change fixes building gst-libs/gst/tag/ code with the Android buildsystem.
-rw-r--r--Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index a78bd6921..e6a07b682 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 && \