diff options
| author | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2017-12-21 13:59:35 -0500 |
|---|---|---|
| committer | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2018-01-26 15:55:24 -0500 |
| commit | d9914b60e86af229aa78eedf2ab605b30ac0fc96 (patch) | |
| tree | df6141ff15890527fea10fcbcb034ac7f96880fb /data | |
| parent | 43968f75bb7752c29e7177187ac9b8eb17661ec7 (diff) | |
gst-android: Remove uneeded static plugin path
We have the same plugin API for static and non-static now.
https://bugzilla.gnome.org/show_bug.cgi?id=791854
Diffstat (limited to 'data')
| -rw-r--r-- | data/ndk-build/gstreamer-1.0.mk | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/data/ndk-build/gstreamer-1.0.mk b/data/ndk-build/gstreamer-1.0.mk index 7b422a2c..de88e81e 100644 --- a/data/ndk-build/gstreamer-1.0.mk +++ b/data/ndk-build/gstreamer-1.0.mk @@ -33,11 +33,6 @@ endif # Expand home directory (~/) GSTREAMER_ROOT := $(wildcard $(GSTREAMER_ROOT)) -# Path for GStreamer static plugins -ifndef GSTREAMER_STATIC_PLUGINS_PATH -GSTREAMER_STATIC_PLUGINS_PATH := $(GSTREAMER_ROOT)/lib/gstreamer-1.0 -endif - # Path for the NDK integration makefiles ifndef GSTREAMER_NDK_BUILD_PATH GSTREAMER_NDK_BUILD_PATH := $(GSTREAMER_ROOT)/share/gst-android/ndk-build @@ -175,7 +170,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 $(G_IO_MODULES_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)) |