Merge branch 'KeyWeeUsr-fix_unpack_dir'

inclement · inclement · commit 229b0efbdd88 · 2017-08-20T22:44:29.000+01:00
diff --git a/pythonforandroid/bootstraps/pygame/build/src/org/renpy/android/SDLSurfaceView.java b/pythonforandroid/bootstraps/pygame/build/src/org/renpy/android/SDLSurfaceView.java
@@ -706,6 +706,7 @@ public void run() {
         nativeResize(mWidth, mHeight);
         nativeInitJavaCallbacks();
         nativeSetEnv("ANDROID_PRIVATE", mFilesDirectory);
+        nativeSetEnv("ANDROID_UNPACK", mFilesDirectory);
         nativeSetEnv("ANDROID_ARGUMENT", mArgument);
         nativeSetEnv("ANDROID_APP_PATH", mArgument);
         nativeSetEnv("PYTHONOPTIMIZE", "2");
diff --git a/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/PythonActivity.java b/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/PythonActivity.java
@@ -172,6 +172,7 @@ protected void onPostExecute(String result) {
             String mFilesDirectory = mActivity.getFilesDir().getAbsolutePath();
             Log.v(TAG, "Setting env vars for start.c and Python to use");
             SDLActivity.nativeSetEnv("ANDROID_PRIVATE", mFilesDirectory);
+            SDLActivity.nativeSetEnv("ANDROID_UNPACK", app_root_dir);
             SDLActivity.nativeSetEnv("PYTHONHOME", app_root_dir);
             SDLActivity.nativeSetEnv("PYTHONPATH", app_root_dir + ":" + app_root_dir + "/lib");
             SDLActivity.nativeSetEnv("PYTHONOPTIMIZE", "2");
diff --git a/pythonforandroid/bootstraps/service_only/build/src/org/kivy/android/PythonService.java b/pythonforandroid/bootstraps/service_only/build/src/org/kivy/android/PythonService.java
@@ -26,6 +26,7 @@ public abstract class PythonService extends Service implements Runnable {
     private String pythonName;
     private String pythonHome;
     private String pythonPath;
+    private String androidUnpack;
     private String serviceEntrypoint;
     private String pythonServiceArgument;
 
@@ -70,6 +71,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         pythonName = extras.getString("pythonName");
         pythonHome = extras.getString("pythonHome");
         pythonPath = extras.getString("pythonPath");
+        androidUnpack = extras.getString("androidUnpack");
         pythonServiceArgument = extras.getString("pythonServiceArgument");
 
         Log.v(TAG, "Starting Python thread");
@@ -127,7 +129,7 @@ public void onDestroy() {
     public void run() {
         PythonUtil.loadLibraries(getFilesDir());
         nativeStart(androidPrivate, androidArgument, serviceEntrypoint, pythonName, pythonHome,
-                pythonPath, pythonServiceArgument);
+                pythonPath, pythonServiceArgument, androidUnpack);
         stopSelf();
     }
 
@@ -143,5 +145,5 @@ public void run() {
     public static native void nativeStart(String androidPrivate, String androidArgument,
                                           String serviceEntrypoint, String pythonName,
                                           String pythonHome, String pythonPath,
-                                          String pythonServiceArgument);
+                                          String pythonServiceArgument, String androidUnpack);
 }
diff --git a/pythonforandroid/bootstraps/service_only/build/templates/Service.tmpl.java b/pythonforandroid/bootstraps/service_only/build/templates/Service.tmpl.java
@@ -40,6 +40,7 @@ public static void start(Context ctx, String pythonServiceArgument) {
         intent.putExtra("serviceDescription", "");
         intent.putExtra("pythonName", "{{ name }}");
         intent.putExtra("pythonHome", argument);
+        intent.putExtra("androidUnpack", argument);
         intent.putExtra("pythonPath", argument + ":" + argument + "/lib");
         intent.putExtra("pythonServiceArgument", pythonServiceArgument);
         ctx.startService(intent);
diff --git a/pythonforandroid/bootstraps/webview/build/src/org/kivy/android/PythonActivity.java b/pythonforandroid/bootstraps/webview/build/src/org/kivy/android/PythonActivity.java
@@ -158,6 +158,7 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
         PythonActivity.nativeSetEnv("ANDROID_PRIVATE", mFilesDirectory);
         PythonActivity.nativeSetEnv("ANDROID_ARGUMENT", mFilesDirectory);
         PythonActivity.nativeSetEnv("ANDROID_APP_PATH", mFilesDirectory);
+        PythonActivity.nativeSetEnv("ANDROID_UNPACK", mFilesDirectory);
         PythonActivity.nativeSetEnv("ANDROID_ENTRYPOINT", "main.pyo");
         PythonActivity.nativeSetEnv("PYTHONHOME", mFilesDirectory);
         PythonActivity.nativeSetEnv("PYTHONPATH", mFilesDirectory + ":" + mFilesDirectory + "/lib");
diff --git a/pythonforandroid/recipes/flask/__init__.py b/pythonforandroid/recipes/flask/__init__.py
@@ -9,7 +9,7 @@ class FlaskRecipe(PythonRecipe):
                         # 0.10.1 at least for now
     url = 'https://github.com/pallets/flask/archive/{version}.zip'
 
-    depends = [('python2', 'python3crystax'), 'setuptools']
+    depends = [('python2', 'python3crystax'), 'setuptools', 'genericndkbuild']
 
     python_depends = ['jinja2', 'werkzeug', 'markupsafe', 'itsdangerous', 'click']
 
diff --git a/pythonforandroid/recipes/pyjnius/__init__.py b/pythonforandroid/recipes/pyjnius/__init__.py
@@ -9,7 +9,7 @@ class PyjniusRecipe(CythonRecipe):
     version = 'master'
     url = 'https://github.com/kivy/pyjnius/archive/{version}.zip'
     name = 'pyjnius'
-    depends = [('python2', 'python3crystax'), ('sdl2', 'sdl', 'genericndkbuild'), 'six']
+    depends = [('python2', 'python3crystax'), ('genericndkbuild', 'sdl2', 'sdl'), 'six']
     site_packages_name = 'jnius'
 
     patches = [('sdl2_jnienv_getter.patch', will_build('sdl2')),
diff --git a/pythonforandroid/recipes/python2/patches/custom-loader.patch b/pythonforandroid/recipes/python2/patches/custom-loader.patch
@@ -17,8 +17,8 @@
 +
 +    /* Ensure we have access to libpymodules. */
 +    if (libpymodules == -1) {
-+        printf("ANDROID_APP_PATH = %s\n", getenv("ANDROID_APP_PATH"));
-+        PyOS_snprintf(pathbuf, sizeof(pathbuf), "%s/libpymodules.so", getenv("ANDROID_APP_PATH"));
++        printf("ANDROID_UNPACK = %s\n", getenv("ANDROID_UNPACK"));
++        PyOS_snprintf(pathbuf, sizeof(pathbuf), "%s/libpymodules.so", getenv("ANDROID_UNPACK"));
 +        libpymodules = dlopen(pathbuf, RTLD_NOW);
 +
 +        if (libpymodules == NULL) {
diff --git a/testapps/setup_pygame.py b/testapps/setup_pygame.py
@@ -3,7 +3,7 @@
 from setuptools import find_packages
 
 options = {'apk': {'debug': None,
-                   'requirements': 'pygame,pyjnius,kivy,python2',
+                   'requirements': 'pygame,pyjnius,kivy,python2,android',
                    'android-api': 19,
                    'ndk-dir': '/home/asandy/android/crystax-ndk-10.3.2',
                    'dist-name': 'bdisttest_pygame',

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@`
`17`	`17`	`+`
`18`	`18`	`+ /* Ensure we have access to libpymodules. */`
`19`	`19`	`+ if (libpymodules == -1) {`
`20`		`-+ printf("ANDROID_APP_PATH = %s\n", getenv("ANDROID_APP_PATH"));`
`21`		`-+ PyOS_snprintf(pathbuf, sizeof(pathbuf), "%s/libpymodules.so", getenv("ANDROID_APP_PATH"));`
	`20`	`++ printf("ANDROID_UNPACK = %s\n", getenv("ANDROID_UNPACK"));`
	`21`	`++ PyOS_snprintf(pathbuf, sizeof(pathbuf), "%s/libpymodules.so", getenv("ANDROID_UNPACK"));`
`22`	`22`	`+ libpymodules = dlopen(pathbuf, RTLD_NOW);`
`23`	`23`	`+`
`24`	`24`	`+ if (libpymodules == NULL) {`