[Android] Load VLC libraries right before medialibrary ones

[Geoffrey Métais]

vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Wed Jul 19 10:29:20 2017 +0200| [ce88530f7fe5ab4be815fa1644aeb7630146faa2] | committer: Geoffrey Métais

Load VLC libraries right before medialibrary  ones

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

 medialibrary/src/org/videolan/medialibrary/Medialibrary.java | 2 ++
 vlc-android/src/org/videolan/vlc/VLCApplication.java         | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/medialibrary/src/org/videolan/medialibrary/Medialibrary.java b/medialibrary/src/org/videolan/medialibrary/Medialibrary.java
index fd46f5801..428bd7616 100644
--- a/medialibrary/src/org/videolan/medialibrary/Medialibrary.java
+++ b/medialibrary/src/org/videolan/medialibrary/Medialibrary.java
@@ -13,6 +13,7 @@ import android.support.v4.content.LocalBroadcastManager;
 import android.text.TextUtils;
 import android.util.Log;
 
+import org.videolan.libvlc.LibVLC;
 import org.videolan.libvlc.util.VLCUtil;
 import org.videolan.medialibrary.interfaces.DevicesDiscoveryCb;
 import org.videolan.medialibrary.interfaces.EntryPointsEventsCb;
@@ -69,6 +70,7 @@ public class Medialibrary {
     private static Medialibrary sInstance;
 
     static {
+        LibVLC.loadLibraries();
         System.loadLibrary("c++_shared");
         System.loadLibrary("mla");
     }
diff --git a/vlc-android/src/org/videolan/vlc/VLCApplication.java b/vlc-android/src/org/videolan/vlc/VLCApplication.java
index cdf45bcaf..874427b79 100644
--- a/vlc-android/src/org/videolan/vlc/VLCApplication.java
+++ b/vlc-android/src/org/videolan/vlc/VLCApplication.java
@@ -94,7 +94,6 @@ public class VLCApplication extends Application {
         runBackground(new Runnable() {
             @Override
             public void run() {
-                VLCInstance.get();
                 // Prepare cache folder constants
                 AudioUtil.prepareCacheFolder(instance);