[Android] Revert "libvlc.so: export only the libvlc symbols"
Thomas Guillem
git at videolan.org
Mon Oct 5 13:13:19 CEST 2015
vlc-ports/android | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Sep 29 09:13:38 2015 +0200| [c96544f779eb69d75519597a12e25e4d87ad5602] | committer: Thomas Guillem
Revert "libvlc.so: export only the libvlc symbols"
This reverts commit e93ca17f683c0bb43d6747f8c812f6265fd8926c.
This reverts commit cc7dd1eb54d03831eb527ce935e0b8eed01ef658.
> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=c96544f779eb69d75519597a12e25e4d87ad5602
---
compile-libvlc.sh | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 499e56a..83adbaf 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -618,12 +618,6 @@ BUILTINS="$BUILTINS NULL\n};\n"; \
printf "/* Autogenerated from the list of modules */\n$DEFINITION\n$BUILTINS\n" > libvlc/jni/libvlcjni-modules.h
rm ${REDEFINED_VLC_MODULES_DIR}/syms
-# Generating the .ver file like libvlc.so upstream
-VER_FILE="vlc/$VLC_BUILD_DIR/lib/.libs/libvlc.ver"
-echo "{ global:" > $VER_FILE
-cat vlc/lib/libvlc.sym | sed -e "s/\(.*\)/\1;/" >> $VER_FILE
-echo "local: *; };" >> $VER_FILE
-
###############################
# NDK-Build for libvlcjni.so #
###############################
@@ -656,7 +650,7 @@ $ANDROID_NDK/ndk-build -C libvlc \
VLC_CONTRIB="$VLC_CONTRIB" \
VLC_MODULES="$VLC_MODULES" \
TARGET_CFLAGS="$EXTRA_CFLAGS" \
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-soname -Wl,libvlc.so.5 -Wl,-version-script -Wl,$SRC_DIR/$VER_FILE" \
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS" \
LIBVLC_LIBS="$LIBVLC_LIBS" \
LIBIOMX_LIBS="$LIBIOMX_LIBS" \
LIBANW_LIBS="$LIBANW_LIBS" \
More information about the Android
mailing list