diff options
| author | Reynaldo H. Verdejo Pinochet <reynaldo@collabora.com> | 2012-08-20 16:33:48 -0400 |
|---|---|---|
| committer | Reynaldo H. Verdejo Pinochet <reynaldo@collabora.com> | 2012-08-20 16:33:48 -0400 |
| commit | 5c222c42f25ad85f806ac10063364e66e88c116a (patch) | |
| tree | b7b44c4202e55f3bc67c338fe8ed710d1208887e | |
| parent | ecf051b2bec58ec01d378dbbb8bf985a040cc934 (diff) | |
Plug libffi and libiconv in (glib deps)
| -rw-r--r-- | jni/Android.mk | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index 8363c86..e29681c 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -12,6 +12,14 @@ else NDK_BUILD := false endif +ifeq ($(LIBFFI_TOP),) +LIBFFI_TOP := $(GSTREAMER_AGGREGATE_TOP)/libffi +endif + +ifeq ($(LIBICONV_TOP),) +LIBICONV_TOP := $(GSTREAMER_AGGREGATE_TOP)/libiconv +endif + ifeq ($(GLIB_TOP),) GLIB_TOP := $(GSTREAMER_AGGREGATE_TOP)/glib endif @@ -74,6 +82,7 @@ CONFIGURE_CFLAGS := \ CONFIGURE_LDFLAGS += -L$(SYSROOT)/usr/lib -L$(TARGET_OUT) -L$(GSTREAMER_AGGREGATE_TOP)/libs CONFIGURE_INCLUDES += -I$(SYSROOT)/usr/include \ -I$(GSTREAMER_AGGREGATE_TOP)/libid3tag \ + -I$(GSTREAMER_AGGREGATE_TOP)/libiconv \ -I$(GSTREAMER_AGGREGATE_TOP)/libmad \ -I$(GSTREAMER_AGGREGATE_TOP)/faad/include \ -I$(GSTREAMER_AGGREGATE_TOP)/faac/include @@ -106,6 +115,7 @@ CONFIGURE_INCLUDES += \ -I$(incdir)) \ -I$(abspath $(TOP)/external/zlib) \ -I$(GSTREAMER_AGGREGATE_TOP)/libid3tag \ + -I$(GSTREAMER_AGGREGATE_TOP)/libiconv \ -I$(GSTREAMER_AGGREGATE_TOP)/libmad \ -I$(GSTREAMER_AGGREGATE_TOP)/faad/include \ -I$(GSTREAMER_AGGREGATE_TOP)/faac/include @@ -114,9 +124,9 @@ endif CONFIGURE_CPPFLAGS := \ $(CONFIGURE_INCLUDES) -CONFIGURE_PKG_CONFIG_LIBDIR := $(GLIB_TOP):$(gstreamer_TOP)/pkgconfig:$(GST_PLUGINS_BASE_TOP)/pkgconfig:$(GST_PLUGINS_GOOD_TOP)/pkgconfig:$(GST_PLUGINS_BAD_TOP)/pkgconfig:$(GSTREAMER_AGGREGATE_TOP)/x264:$(MAD_TOP):$(OGG_TOP) +CONFIGURE_PKG_CONFIG_LIBDIR := $(LIBFFI_TOP):$(GLIB_TOP):$(gstreamer_TOP)/pkgconfig:$(GST_PLUGINS_BASE_TOP)/pkgconfig:$(GST_PLUGINS_GOOD_TOP)/pkgconfig:$(GST_PLUGINS_BAD_TOP)/pkgconfig:$(GSTREAMER_AGGREGATE_TOP)/x264:$(MAD_TOP):$(OGG_TOP) -PKG_CONFIG := PKG_CONFIG_LIBDIR=$(CONFIGURE_PKG_CONFIG_LIBDIR) PKG_CONFIG_TOP_BUILD_DIR="/" pkg-config +PKG_CONFIG := PKG_CONFIG_LIBDIR="$(CONFIGURE_PKG_CONFIG_LIBDIR)" PKG_CONFIG_TOP_BUILD_DIR="/" pkg-config GST_CFLAGS := \ -DD_GNU_SOURCE \ -DGST_DISABLE_DEPRECATED \ @@ -136,6 +146,8 @@ include $(GSTREAMER_AGGREGATE_TOP)/faac/Android.mk include $(GSTREAMER_AGGREGATE_TOP)/ogg/Android.mk include $(GSTREAMER_AGGREGATE_TOP)/libmad/Android.mk include $(GSTREAMER_AGGREGATE_TOP)/libid3tag/Android.mk +include $(GSTREAMER_AGGREGATE_TOP)/libffi/Android.mk +include $(GSTREAMER_AGGREGATE_TOP)/libiconv/Android.mk include $(GSTREAMER_AGGREGATE_TOP)/glib/Android.mk include $(GSTREAMER_AGGREGATE_TOP)/gstreamer/Android.mk include $(GSTREAMER_AGGREGATE_TOP)/gst-plugins-base/Android.mk |