Skip to content

Commit e5d33b7

Browse files
committed
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
1 parent 230fb66 commit e5d33b7

File tree

7 files changed

+34
-276
lines changed

7 files changed

+34
-276
lines changed

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
import android.os.Process;
1515
import java.io.File;
1616

17-
import org.kivy.android.PythonUtil;
18-
1917
import org.renpy.android.Hardware;
2018

2119

@@ -142,9 +140,7 @@ public void onTaskRemoved(Intent rootIntent) {
142140

143141
@Override
144142
public void run(){
145-
String app_root = getFilesDir().getAbsolutePath() + "/app";
146-
File app_root_file = new File(app_root);
147-
PythonUtil.loadLibraries(app_root_file);
143+
System.loadLibrary("main");
148144
this.mService = this;
149145
nativeStart(
150146
androidPrivate, androidArgument,

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

Lines changed: 0 additions & 82 deletions
This file was deleted.

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import org.libsdl.app.SDL;
4444
import org.libsdl.app.SDLActivity;
4545

46-
import org.kivy.android.PythonUtil;
4746
import org.kivy.android.launcher.Project;
4847

4948
import org.renpy.android.ResourceManager;
@@ -80,12 +79,6 @@ protected void onCreate(Bundle savedInstanceState) {
8079
new UnpackFilesTask().execute(getAppRoot());
8180
}
8281

83-
public void loadLibraries() {
84-
String app_root = new String(getAppRoot());
85-
File app_root_file = new File(app_root);
86-
PythonUtil.loadLibraries(app_root_file);
87-
}
88-
8982
public void recursiveDelete(File f) {
9083
if (f.isDirectory()) {
9184
for (File r : f.listFiles()) {

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

Lines changed: 0 additions & 100 deletions
This file was deleted.

0 commit comments

Comments
 (0)