[Android] Revert "compile-libvlc: use $entry without renaming"

[Hugo Beauzée-Luyssen]

vlc-android | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Wed Aug 12 16:10:51 2020 +0200| [8c377d6251e26834c1e228b2ab8864edf12c1a09] | committer: Hugo Beauzée-Luyssen

Revert "compile-libvlc: use $entry without renaming"

This reverts commit 80b396d318e5f9686f4087377ea6f0fab93664cb.

This was not working when using vlc 3.0, which lacks
videolan/vlc at 203b4374a7b5dd727852023f33ad0c63a5f9b353
Since this commit was missing, there was a mismatch between what the
vlc-android buildscript expected from entry points and their actual name
The module type was lacking

> https://code.videolan.org/videolan/vlc-android/commit/8c377d6251e26834c1e228b2ab8864edf12c1a09
---

 buildsystem/compile-libvlc.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/buildsystem/compile-libvlc.sh b/buildsystem/compile-libvlc.sh
index 7198e0fd7..438b883e1 100755
--- a/buildsystem/compile-libvlc.sh
+++ b/buildsystem/compile-libvlc.sh
@@ -607,12 +607,15 @@ OpenFilter OpenFilter__$name
 CloseFilter CloseFilter__$name
 Open Open__$name
 Close Close__$name
+$entry vlc_entry__$name
+$copyright vlc_entry_copyright__$name
+$license vlc_entry_license__$name
 EOF
     ${CROSS_TOOLS}objcopy --redefine-syms ${REDEFINED_VLC_MODULES_DIR}/syms $file $outfile
     avlc_checkfail "objcopy failed"
 
-    DEFINITION=$DEFINITION"int $entry (int (*)(void *, void *, int, ...), void *);\n";
-    BUILTINS="$BUILTINS $entry,\n";
+    DEFINITION=$DEFINITION"int vlc_entry__$name (int (*)(void *, void *, int, ...), void *);\n";
+    BUILTINS="$BUILTINS vlc_entry__$name,\n";
 done;
 BUILTINS="$BUILTINS NULL\n};\n"; \
 printf "/* Autogenerated from the list of modules */\n#include <unistd.h>\n$DEFINITION\n$BUILTINS\n" > $VLC_OUT_PATH/libvlcjni-modules.c