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

[Alexandre Janniaux]

vlc-android | branch: master | Alexandre Janniaux <ajanni at videolabs.io> | Tue Jul 21 18:16:36 2020 +0200| [80b396d318e5f9686f4087377ea6f0fab93664cb] | committer: Alexandre Janniaux

compile-libvlc: use $entry without renaming

The symbol is already renamed by the libvlc build system so there is no
need to rename it again. It allows the build script to work both with
vlc_entry suffixed by MODULE_NAME or MODULE_FULLNAME.

> https://code.videolan.org/videolan/vlc-android/commit/80b396d318e5f9686f4087377ea6f0fab93664cb
---

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

diff --git a/buildsystem/compile-libvlc.sh b/buildsystem/compile-libvlc.sh
index 438b883e1..7198e0fd7 100755
--- a/buildsystem/compile-libvlc.sh
+++ b/buildsystem/compile-libvlc.sh
@@ -607,15 +607,12 @@ 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 vlc_entry__$name (int (*)(void *, void *, int, ...), void *);\n";
-    BUILTINS="$BUILTINS vlc_entry__$name,\n";
+    DEFINITION=$DEFINITION"int $entry (int (*)(void *, void *, int, ...), void *);\n";
+    BUILTINS="$BUILTINS $entry,\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