Fixed filepath getting in PythonUtil.java

inclement · inclement · commit dedfc89ce673 · 2016-01-13T23:23:57.000Z
diff --git a/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/PythonUtil.java b/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/PythonUtil.java
@@ -19,6 +19,9 @@ protected static String[] getLibraries() {
     }
 
 	public static void loadLibraries(File filesDir) {
+
+        String filesDirPath = filesDir.getAbsolutePath();
+
 		for (String lib : getLibraries()) {
             System.loadLibrary(lib);
         }
@@ -36,15 +39,15 @@ public static void loadLibraries(File filesDir) {
         }
         
         try {
-            System.load(getFilesDir() + "/lib/python2.7/lib-dynload/_io.so");
-            System.load(getFilesDir() + "/lib/python2.7/lib-dynload/unicodedata.so");
+            System.load(filesDirPath + "/lib/python2.7/lib-dynload/_io.so");
+            System.load(filesDirPath + "/lib/python2.7/lib-dynload/unicodedata.so");
         } catch(UnsatisfiedLinkError e) {
             Log.v(TAG, "Failed to load _io.so or unicodedata.so...but that's okay.");
         }
         
         try {
             // System.loadLibrary("ctypes");
-            System.load(getFilesDir() + "/lib/python2.7/lib-dynload/_ctypes.so");
+            System.load(filesDirPath + "/lib/python2.7/lib-dynload/_ctypes.so");
         } catch(UnsatisfiedLinkError e) {
             Log.v(TAG, "Unsatisfied linker when loading ctypes");
         }

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,9 @@ protected static String[] getLibraries() {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`public static void loadLibraries(File filesDir) {`
	`22`	`+`
	`23`	`+ String filesDirPath = filesDir.getAbsolutePath();`
	`24`	`+`
`22`	`25`	`for (String lib : getLibraries()) {`
`23`	`26`	`System.loadLibrary(lib);`
`24`	`27`	`}`
`@@ -36,15 +39,15 @@ public static void loadLibraries(File filesDir) {`
`36`	`39`	`}`
`37`	`40`
`38`	`41`	`try {`
`39`		`- System.load(getFilesDir() + "/lib/python2.7/lib-dynload/_io.so");`
`40`		`- System.load(getFilesDir() + "/lib/python2.7/lib-dynload/unicodedata.so");`
	`42`	`+ System.load(filesDirPath + "/lib/python2.7/lib-dynload/_io.so");`
	`43`	`+ System.load(filesDirPath + "/lib/python2.7/lib-dynload/unicodedata.so");`
`41`	`44`	`} catch(UnsatisfiedLinkError e) {`
`42`	`45`	`Log.v(TAG, "Failed to load _io.so or unicodedata.so...but that's okay.");`
`43`	`46`	`}`
`44`	`47`
`45`	`48`	`try {`
`46`	`49`	`// System.loadLibrary("ctypes");`
`47`		`- System.load(getFilesDir() + "/lib/python2.7/lib-dynload/_ctypes.so");`
	`50`	`+ System.load(filesDirPath + "/lib/python2.7/lib-dynload/_ctypes.so");`
`48`	`51`	`} catch(UnsatisfiedLinkError e) {`
`49`	`52`	`Log.v(TAG, "Unsatisfied linker when loading ctypes");`
`50`	`53`	`}`