Skip to content

[WIP] Remove the libraries loading mechanism #1543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[WIP] Remove the libraries loading mechanism #1543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions pythonforandroid/bootstraps/common/build/src/main/java/org/kivy/android/PythonService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
import android.os.Process;
import java.io.File;

import org.kivy.android.PythonUtil;

import org.renpy.android.Hardware;


Expand Down Expand Up @@ -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,
Expand Down
82 changes: 0 additions & 82 deletions pythonforandroid/bootstraps/common/build/src/main/java/org/kivy/android/PythonUtil.java
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
import org.libsdl.app.SDL;
import org.libsdl.app.SDLActivity;

import org.kivy.android.PythonUtil;
import org.kivy.android.launcher.Project;

import org.renpy.android.ResourceManager;
Expand Down Expand Up @@ -80,12 +79,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()) {
Expand Down
100 changes: 0 additions & 100 deletions pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonUtil.java
View file
Open in desktop

This file was deleted.

Loading