Remove the libraries loading mechanism

Because we have proved that we don't need that (we take care of that in gradle configuration)...so...there is no need to keep the loading mechanism to only load a single library `libmain.so` which is the only one we need to load...all others will be loaded automatically by the android os library system.

Note: This changes affects bootstraps: sdl2, webview and service_only

Author: opacam

pythonforandroid/bootstraps/common/build/src/main/java/org/kivy/android/PythonService.java

@@ -14,8 +14,6 @@
 import android.os.Process;
 import java.io.File;
 
-import org.kivy.android.PythonUtil;
-
 import org.renpy.android.Hardware;
 
 
@@ -142,9 +140,7 @@ public void onTaskRemoved(Intent rootIntent) {
 
     @Override
     public void run(){
-        String app_root =  getFilesDir().getAbsolutePath() + "/app";
-        File app_root_file = new File(app_root);
-        PythonUtil.loadLibraries(app_root_file);
+        System.loadLibrary("main");
         this.mService = this;
         nativeStart(
             androidPrivate, androidArgument,

pythonforandroid/bootstraps/common/build/src/main/java/org/kivy/android/PythonUtil.java

@@ -36,7 +36,6 @@
 
 import org.libsdl.app.SDLActivity;
 
-import org.kivy.android.PythonUtil;
 import org.kivy.android.launcher.Project;
 
 import org.renpy.android.ResourceManager;
@@ -73,12 +72,6 @@ protected void onCreate(Bundle savedInstanceState) {
         new UnpackFilesTask().execute(getAppRoot());
     }
 
-    public void loadLibraries() {
-        String app_root = new String(getAppRoot());
-        File app_root_file = new File(app_root);
-        PythonUtil.loadLibraries(app_root_file);
-    }
-
     public void recursiveDelete(File f) {
         if (f.isDirectory()) {
             for (File r : f.listFiles()) {

pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonActivity.java

@@ -58,32 +58,6 @@ public class SDLActivity extends Activity {
     // Audio
     protected static AudioTrack mAudioTrack;
 
-    /**
-     * This method is called by SDL before loading the native shared libraries.
-     * It can be overridden to provide names of shared libraries to be loaded.
-     * The default implementation returns the defaults. It never returns null.
-     * An array returned by a new implementation must at least contain "SDL2".
-     * Also keep in mind that the order the libraries are loaded may matter.
-     * @return names of shared libraries to be loaded (e.g. "SDL2", "main").
-     */
-    protected String[] getLibraries() {
-        return new String[] {
-            "SDL2",
-            // "SDL2_image",
-            // "SDL2_mixer",
-            // "SDL2_net",
-            // "SDL2_ttf",
-            "main"
-        };
-    }
-
-    // Load the .so
-    public void loadLibraries() {
-       for (String lib : getLibraries()) {
-          System.loadLibrary(lib);
-       }
-    }
-
     /**
      * This method is called by SDL before starting the native application thread.
      * It can be overridden to provide the arguments after the application name.
@@ -130,7 +104,7 @@ protected void finishLoad() {
         // Load shared libraries
         String errorMsgBrokenLib = "";
         try {
-            loadLibraries();
+            System.loadLibrary("main");
         } catch(UnsatisfiedLinkError e) {
             System.err.println(e.getMessage());
             mBrokenLibraries = true;

pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonUtil.java

@@ -46,8 +46,6 @@
 import android.webkit.WebViewClient;
 import android.webkit.WebView;
 
-import org.kivy.android.PythonUtil;
-
 import org.renpy.android.ResourceManager;
 import org.renpy.android.AssetExtract;
 
@@ -106,7 +104,7 @@ protected void onCreate(Bundle savedInstanceState) {
         // Load shared libraries
         String errorMsgBrokenLib = "";
         try {
-            loadLibraries();
+            System.loadLibrary("main");
         } catch(UnsatisfiedLinkError e) {
             System.err.println(e.getMessage());
             mBrokenLibraries = true;
@@ -181,12 +179,6 @@ public void onDestroy() {
         android.os.Process.killProcess(android.os.Process.myPid());
     }
 
-    public void loadLibraries() {
-        String app_root = new String(getAppRoot());
-        File app_root_file = new File(app_root);
-        PythonUtil.loadLibraries(app_root_file);
-    }
-
     public void recursiveDelete(File f) {
         if (f.isDirectory()) {
             for (File r : f.listFiles()) {

pythonforandroid/bootstraps/sdl2/build/src/main/java/org/libsdl/app/SDLActivity.java

@@ -48,8 +48,6 @@
 import android.webkit.WebViewClient;
 import android.webkit.WebView;
 
-import org.kivy.android.PythonUtil;
-
 import org.kivy.android.WebViewLoader;
 
 import org.renpy.android.ResourceManager;
@@ -115,7 +113,7 @@ protected void onCreate(Bundle savedInstanceState) {
         // Load shared libraries
         String errorMsgBrokenLib = "";
         try {
-            loadLibraries();
+            System.loadLibrary("main");
         } catch(UnsatisfiedLinkError e) {
             System.err.println(e.getMessage());
             mBrokenLibraries = true;
@@ -212,12 +210,6 @@ public void onDestroy() {
         android.os.Process.killProcess(android.os.Process.myPid());
     }
 
-    public void loadLibraries() {
-        String app_root = new String(getAppRoot());
-        File app_root_file = new File(app_root);
-        PythonUtil.loadLibraries(app_root_file);
-    }
-
     public void recursiveDelete(File f) {
         if (f.isDirectory()) {
             for (File r : f.listFiles()) {