diff options
| author | Mart Raudsepp <mart@leio.tech> | 2020-04-02 11:00:21 +0300 |
|---|---|---|
| committer | GStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2020-04-03 10:12:14 +0000 |
| commit | 93257a7f17453f8d75100bbfda5716a3f752d3eb (patch) | |
| tree | 27770b5823c8cc917edfe0ba935cf895639c4948 /data | |
| parent | 41d58348203d02ea846b867cb5478b32a9886c88 (diff) | |
ndk-build: keep linking to GSTREAMER_EXTRA_LIBS explicitly
When removing hogweed linkage for gio workaround, the $GSTREAMER_EXTRA_LIBS
entry got removed from GSTREAMER_ANDROID_LIBS as well. Add it back, so it
works as intended in commit d4d75a04065 and needed linkages like EGL work
again via GSTREAMER_EXTRA_LIBS `-l` entries (instead of having to workaround
via TARGET_LDFLAGS).
Fixes: e3892148653bd96a1d1f8f370809762dc8903795
Diffstat (limited to 'data')
| -rw-r--r-- | data/ndk-build/gstreamer-1.0.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/ndk-build/gstreamer-1.0.mk b/data/ndk-build/gstreamer-1.0.mk index c44e3c45..a9cf00bf 100644 --- a/data/ndk-build/gstreamer-1.0.mk +++ b/data/ndk-build/gstreamer-1.0.mk @@ -151,7 +151,7 @@ G_IO_MODULES_LOAD := $(foreach module, $(G_IO_MODULES), \ # Get the full list of libraries # link at least to gstreamer-1.0 in case the plugins list is empty GSTREAMER_ANDROID_LIBS := $(call pkg-config-get-libs,$(GSTREAMER_DEPS)) -GSTREAMER_ANDROID_LIBS += $(GSTREAMER_PLUGINS_LIBS) $(G_IO_MODULES_LIBS) -llog -lz +GSTREAMER_ANDROID_LIBS += $(GSTREAMER_PLUGINS_LIBS) $(G_IO_MODULES_LIBS) $(GSTREAMER_EXTRA_LIBS) -llog -lz GSTREAMER_ANDROID_WHOLE_AR := $(call pkg-config-get-libs-no-deps,$(GSTREAMER_DEPS)) $(GSTREAMER_EXTRA_LIBS) GSTREAMER_ANDROID_CFLAGS := $(call pkg-config-get-includes,$(GSTREAMER_DEPS)) -I$(GSTREAMER_ROOT)/include |