Merge pull request kivy#649 from kived/fix-libs-pre-kitkat

kived · kived · commit 24831dfb229b · 2016-02-19T09:29:03.000-06:00
load python lib before main
diff --git a/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/PythonUtil.java b/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/PythonUtil.java
@@ -14,30 +14,29 @@ protected static String[] getLibraries() {
             "SDL2_image",
             "SDL2_mixer",
             "SDL2_ttf",
+            "python2.7",
+            "python3.5m",
             "main"
         };
     }
 
 	public static void loadLibraries(File filesDir) {
 
         String filesDirPath = filesDir.getAbsolutePath();
+        boolean skippedPython = false;
 
 		for (String lib : getLibraries()) {
-            System.loadLibrary(lib);
+		    try {
+                System.loadLibrary(lib);
+            } catch(UnsatisfiedLinkError e) {
+                if (lib.startsWith("python") && !skippedPython) {
+                    skippedPython = true;
+                    continue;
+                }
+                throw e;
+            }
         }
 
-        try {
-            System.loadLibrary("python2.7");
-        } catch(UnsatisfiedLinkError e) {
-            Log.v(TAG, "Failed to load libpython2.7");
-        }
-        
-        try {
-            System.loadLibrary("python3.5m");
-        } catch(UnsatisfiedLinkError e) {
-            Log.v(TAG, "Failed to load libpython3.5m");
-        }
-        
         try {
             System.load(filesDirPath + "/lib/python2.7/lib-dynload/_io.so");
             System.load(filesDirPath + "/lib/python2.7/lib-dynload/unicodedata.so");
