Improved logging of library loading in PythonUtil.java

inclement · inclement · commit 9afdc77e3fa5 · 2017-08-31T21:47:33.000+01:00
diff --git a/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/PythonUtil.java b/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/PythonUtil.java
@@ -27,6 +27,7 @@ public static void loadLibraries(File filesDir) {
         boolean foundPython = false;
 
 		for (String lib : getLibraries()) {
+            Log.v("python", "Loading library: " + lib);
 		    try {
                 System.loadLibrary(lib);
                 if (lib.startsWith("python")) {
@@ -36,10 +37,15 @@ public static void loadLibraries(File filesDir) {
                 // If this is the last possible libpython
                 // load, and it has failed, give a more
                 // general error
+                Log.v("python", "Library loading error: " + e.getMessage());
                 if (lib.startsWith("python3.6") && !foundPython) {
                     throw new java.lang.RuntimeException("Could not load any libpythonXXX.so");
+                } else if (lib.startsWith("python")) {
+                    continue;
+                } else {
+                    Log.v("python", "An UnsatisfiedLinkError occurred loading " + lib);
+                    throw e;
                 }
-                continue;
             }
         }
 
