diff options
| author | Matthew Waters <matthew@centricular.com> | 2018-08-27 17:04:34 +1000 |
|---|---|---|
| committer | Matthew Waters <matthew@centricular.com> | 2018-08-28 16:37:06 +1000 |
| commit | 60230e0e8311ef82ec904682980963b5a004014e (patch) | |
| tree | 7f3047a123b8be78e1046ac931d66b47ae7ef767 /data | |
| parent | 772a21a8cb98adcb29b94599d06541a9cc2d5ebb (diff) | |
ndk-build: fix gio module loading for meson changes
gio modules are not in a specific (static/) subdirectory anymore.
Also change how we reference the modules as using -L will preferentially
locate the shared library over the static library. Add the full path to
the static library module instead.
Diffstat (limited to 'data')
| -rw-r--r-- | data/ndk-build/gstreamer-1.0.mk | 7 | ||||
| -rw-r--r-- | data/ndk-build/gstreamer_android-1.0.c.in | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/data/ndk-build/gstreamer-1.0.mk b/data/ndk-build/gstreamer-1.0.mk index cd5fdd04..7e900cbe 100644 --- a/data/ndk-build/gstreamer-1.0.mk +++ b/data/ndk-build/gstreamer-1.0.mk @@ -59,7 +59,7 @@ endif include $(GSTREAMER_NDK_BUILD_PATH)/tools.mk # Path for the static GIO modules -G_IO_MODULES_PATH := $(GSTREAMER_ROOT)/lib/gio/modules/static +G_IO_MODULES_PATH := $(GSTREAMER_ROOT)/lib/gio/modules # Host tools ifeq ($(HOST_OS),windows) @@ -139,8 +139,7 @@ GSTREAMER_PLUGINS_REGISTER := $(foreach plugin, $(GSTREAMER_PLUGINS), \ GST_PLUGIN_STATIC_REGISTER($(plugin));) # Generate list of gio modules -G_IO_MODULES_PATH := $(foreach path, $(G_IO_MODULES_PATH), -L$(path)) -G_IO_MODULES_LIBS := $(foreach module, $(G_IO_MODULES), -lgio$(module)) +G_IO_MODULES_LIBS := $(foreach module, $(G_IO_MODULES), $(G_IO_MODULES_PATH)/libgio$(module).a) G_IO_MODULES_DECLARE := $(foreach module, $(G_IO_MODULES), \ GST_G_IO_MODULE_DECLARE($(module));) G_IO_MODULES_LOAD := $(foreach module, $(G_IO_MODULES), \ @@ -177,7 +176,7 @@ endif # Create the link command GSTREAMER_ANDROID_CMD := $(call libtool-link,$(TARGET_CC) $(TARGET_LDFLAGS) -shared --sysroot=$(SYSROOT_GST_LINK) \ -o $(GSTREAMER_ANDROID_SO) $(GSTREAMER_ANDROID_O) \ - -L$(GSTREAMER_ROOT)/lib -L$(GSTREAMER_STATIC_PLUGINS_PATH) $(G_IO_MODULES_PATH) \ + -L$(GSTREAMER_ROOT)/lib -L$(GSTREAMER_STATIC_PLUGINS_PATH) \ $(GSTREAMER_ANDROID_LIBS), $(GSTREAMER_LD)) -Wl,-no-undefined $(GSTREAMER_LD) GSTREAMER_ANDROID_CMD := $(call libtool-whole-archive,$(GSTREAMER_ANDROID_CMD),$(GSTREAMER_ANDROID_WHOLE_AR)) diff --git a/data/ndk-build/gstreamer_android-1.0.c.in b/data/ndk-build/gstreamer_android-1.0.c.in index 5453dc78..ef91e2ee 100644 --- a/data/ndk-build/gstreamer_android-1.0.c.in +++ b/data/ndk-build/gstreamer_android-1.0.c.in @@ -49,10 +49,10 @@ static JavaVM *_java_vm = NULL; static GstClockTime _priv_gst_info_start_time; #define GST_G_IO_MODULE_DECLARE(name) \ -extern void G_PASTE(g_io_module_, G_PASTE(name, _load_static)) (void) +extern void G_PASTE(g_io_, G_PASTE(name, _load)) (gpointer data) #define GST_G_IO_MODULE_LOAD(name) \ -G_PASTE(g_io_module_, G_PASTE(name, _load_static)) () +G_PASTE(g_io_, G_PASTE(name, _load)) (NULL) /* Declaration of static plugins */ @PLUGINS_DECLARATION@ |