[vlc-commits] [Git][videolan/vlc][master] 5 commits: lib: use -avoid-version on android

Steve Lhomme (@robUx4) gitlab at videolan.org
Wed Jun 10 11:53:45 UTC 2026 


Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
74b04cad by Alexandre Janniaux at 2026-06-10T11:37:54+00:00
lib: use -avoid-version on android

Android doesn't support the shared version suffix and expects bare .so
files in the tree. In theory we should still generate them when not
building an APK but we don't have option for that yet.

- - - - -
010c6e75 by Alexandre Janniaux at 2026-06-10T11:37:54+00:00
src: use -avoid-version on android

Android doesn't support the shared version suffix and expects bare .so
files in the tree. In theory we should still generate them when not
building an APK but we don't have option for that yet.

- - - - -
98f0eedb by Alexandre Janniaux at 2026-06-10T11:37:54+00:00
modules: stream_out: add missing -llog for android

This is used by protobuf.

- - - - -
e338e29d by Alexandre Janniaux at 2026-06-10T11:37:54+00:00
modules: fix plugins dependencies on android

In dynamic plugins, libandroid_utils needs -landroid since it's using
ANativeWindow/ASurfaceTexture functions, and needs libandroid_env, but
because it's a convenience library we need to ensure it doesn't get
linked twice.

- - - - -
949374c3 by Alexandre Janniaux at 2026-06-10T11:37:54+00:00
codec: Makefile.am: add missing -lmediandk for mediacodec

- - - - -


6 changed files:

- lib/Makefile.am
- modules/codec/Makefile.am
- modules/stream_out/Makefile.am
- modules/video_output/Makefile.am
- modules/video_output/opengl/Makefile.am
- src/Makefile.am


Changes:

=====================================
lib/Makefile.am
=====================================
@@ -92,6 +92,9 @@ endif
 if HAVE_TVOS
 libvlc_la_LDFLAGS += -avoid-version
 endif
+if HAVE_ANDROID
+libvlc_la_LDFLAGS += -avoid-version
+endif
 
 pkgconfig_DATA = libvlc.pc
 


=====================================
modules/codec/Makefile.am
=====================================
@@ -498,7 +498,7 @@ libmediacodec_plugin_la_SOURCES = codec/omxil/mediacodec.c codec/omxil/mediacode
 	codec/omxil/mediacodec_jni.c codec/omxil/mediacodec_ndk.c codec/omxil/utils.c \
 	codec/omxil/omxil_utils.h codec/omxil/qcom.c codec/omxil/qcom.h
 libmediacodec_plugin_la_LIBADD = libchroma_copy.la libvlc_hxxxhelper.la \
-	libandroid_env.la libandroid_utils.la $(LIBDL) $(GLES2_LIBS) $(EGL_LIBS)
+	libandroid_utils.la $(LIBDL) $(GLES2_LIBS) $(EGL_LIBS) -lmediandk
 codec_PLUGINS += $(LTLIBomxil)
 EXTRA_LTLIBRARIES += libomxil_plugin.la
 if HAVE_ANDROID


=====================================
modules/stream_out/Makefile.am
=====================================
@@ -154,6 +154,9 @@ libstream_out_chromecast_plugin_la_SOURCES = stream_out/chromecast/cast.cpp stre
 nodist_libstream_out_chromecast_plugin_la_SOURCES = stream_out/chromecast/@PROTOBUF_VERSION@/cast_channel.pb.cc
 libstream_out_chromecast_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -Istream_out/chromecast/@PROTOBUF_VERSION@ $(CHROMECAST_CFLAGS)
 libstream_out_chromecast_plugin_la_LIBADD = $(CHROMECAST_LIBS) $(SOCKET_LIBS) libvlc_json.la
+if HAVE_ANDROID
+libstream_out_chromecast_plugin_la_LIBADD += -llog
+endif
 CLEANFILES += $(nodist_libstream_out_chromecast_plugin_la_SOURCES)
 
 if ENABLE_SOUT


=====================================
modules/video_output/Makefile.am
=====================================
@@ -334,7 +334,7 @@ endif
 ### Android ###
 libandroid_utils_la_SOURCES = video_output/android/utils.c video_output/android/utils.h
 libandroid_utils_la_CFLAGS = $(AM_CFLAGS) $(GLES2_CFLAGS) $(EGL_CFLAGS)
-libandroid_utils_la_LIBADD = $(GLES2_LIBS) $(EGL_LIBS)
+libandroid_utils_la_LIBADD = $(GLES2_LIBS) $(EGL_LIBS) -landroid libandroid_env.la
 
 libandroid_env_la_SOURCES = \
 	video_output/android/env.c \
@@ -347,23 +347,23 @@ endif
 
 libegl_android_plugin_la_SOURCES = video_output/opengl/egl.c
 libegl_android_plugin_la_CFLAGS = $(AM_CFLAGS) $(EGL_CFLAGS) -DUSE_PLATFORM_ANDROID=1
-libegl_android_plugin_la_LIBADD = libandroid_env.la $(EGL_LIBS) libandroid_utils.la
+libegl_android_plugin_la_LIBADD = $(EGL_LIBS) libandroid_utils.la
 
 libandroid_window_plugin_la_SOURCES = video_output/android/window.c \
 	video_output/wasync_resize_compressor.h
 libandroid_window_plugin_la_LIBADD = \
-	libandroid_env.la libandroid_utils.la $(LIBDL) $(EGL_LIBS) $(GLES2_LIBS)
+	libandroid_utils.la $(LIBDL) $(EGL_LIBS) $(GLES2_LIBS)
 
 libandroid_display_plugin_la_SOURCES = video_output/android/display.c \
 	video_output/opengl/sub_renderer.c \
 	video_output/opengl/sub_renderer.h
 libandroid_display_plugin_la_CFLAGS = $(AM_CFLAGS) $(GLES2_CFLAGS) -DUSE_OPENGL_ES2
-libandroid_display_plugin_la_LIBADD = libvlc_opengles.la $(EGL_LIBS) $(GLES2_LIBS) libandroid_utils.la libandroid_env.la
+libandroid_display_plugin_la_LIBADD = libvlc_opengles.la $(EGL_LIBS) $(GLES2_LIBS) libandroid_utils.la
 
 libglinterop_asurface_plugin_la_SOURCES = video_output/opengl/interop_asurface.c \
 	video_output/opengl/interop.h
 libglinterop_asurface_plugin_la_CFLAGS = $(AM_CFLAGS) -DUSE_OPENGL_ES2
-libglinterop_asurface_plugin_la_LIBADD = libandroid_env.la libandroid_utils.la \
+libglinterop_asurface_plugin_la_LIBADD = libandroid_utils.la \
 	$(EGL_LIBS) $(GLES2_LIBS)
 
 libglinterop_aimage_plugin_la_SOURCES = video_output/opengl/interop_aimage.c \


=====================================
modules/video_output/opengl/Makefile.am
=====================================
@@ -238,7 +238,7 @@ endif
 libegl_surfacetexture_plugin_la_SOURCES = video_filter/egl_surfacetexture.c
 libegl_surfacetexture_plugin_la_CFLAGS = $(AM_CFLAGS) $(EGL_CFLAGS) -DUSE_OPENGL_ES2
 libegl_surfacetexture_plugin_la_LIBADD = $(EGL_LIBS) \
-	libandroid_env.la libandroid_utils.la libvlc_opengles.la
+	libandroid_utils.la libvlc_opengles.la
 
 if HAVE_ANDROID
 if HAVE_EGL


=====================================
src/Makefile.am
=====================================
@@ -625,6 +625,9 @@ endif
 if HAVE_TVOS
 libvlccore_la_LDFLAGS += -avoid-version
 endif
+if HAVE_ANDROID
+libvlccore_la_LDFLAGS += -avoid-version
+endif
 
 libvlccore_win32_rc.$(OBJEXT): libvlccore_win32_rc.rc $(top_srcdir)/extras/package/win32/libvlccore.dll.manifest
 	$(WINDRES) --include-dir $(top_srcdir)/share --include-dir $(top_srcdir)/extras/package/win32 -i $< -o $@



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/b4fff265996f85b3745979bcbf1cba3915d03f67...949374c3fde7c76f48021b13809a7c5cb6ddaea1

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/b4fff265996f85b3745979bcbf1cba3915d03f67...949374c3fde7c76f48021b13809a7c5cb6ddaea1
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help

More information about the vlc-commits mailing list