[Android] Move libvlcjni.h to libvlcjni-modules.h

[Jean-Baptiste Kempf]

vlc-ports/android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon May 25 12:02:50 2015 +0200| [af5d7d15ae7ea4f7c2c72630b2ed327699f2e84e] | committer: Jean-Baptiste Kempf

Move libvlcjni.h to libvlcjni-modules.h

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=af5d7d15ae7ea4f7c2c72630b2ed327699f2e84e
---

 compile-libvlc.sh      |    2 +-
 libvlc/.gitignore      |    2 +-
 libvlc/jni/libvlcjni.c |    2 +-
 vlc-android/.gitignore |    1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 3cae983..12a593b 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -603,7 +603,7 @@ EOF
     BUILTINS="$BUILTINS vlc_entry__$name,\n";
 done;
 BUILTINS="$BUILTINS NULL\n};\n"; \
-printf "/* Autogenerated from the list of modules */\n$DEFINITION\n$BUILTINS\n" > libvlc/jni/libvlcjni.h
+printf "/* Autogenerated from the list of modules */\n$DEFINITION\n$BUILTINS\n" > libvlc/jni/libvlcjni-modules.h
 rm ${REDIFINED_VLC_MODULES_DIR}/syms
 
 ###############################
diff --git a/libvlc/.gitignore b/libvlc/.gitignore
index cc7e761..8fc0483 100644
--- a/libvlc/.gitignore
+++ b/libvlc/.gitignore
@@ -2,5 +2,5 @@ bin/
 gen/
 libs/
 obj/
-jni/libvlcjni.h
+jni/libvlcjni-modules.h
 .settings
diff --git a/libvlc/jni/libvlcjni.c b/libvlc/jni/libvlcjni.c
index fb02f14..12c15cf 100644
--- a/libvlc/jni/libvlcjni.c
+++ b/libvlc/jni/libvlcjni.c
@@ -35,7 +35,7 @@
 
 #include <android/api-level.h>
 
-#include "libvlcjni.h"
+#include "libvlcjni-modules.h"
 #include "vout.h"
 #include "utils.h"
 #include "native_crash_handler.h"
diff --git a/vlc-android/.gitignore b/vlc-android/.gitignore
index cc7e761..6bf5cc5 100644
--- a/vlc-android/.gitignore
+++ b/vlc-android/.gitignore
@@ -2,5 +2,4 @@ bin/
 gen/
 libs/
 obj/
-jni/libvlcjni.h
 .settings