Fixed bootstrap code to correctly load and run a python3 bundle

Author: inclement

pythonforandroid/bootstraps/sdl2/__init__.py

@@ -119,6 +119,7 @@ def run_distribute(self):
                 modules_build_dir = join(
                     self.ctx.python_recipe.get_build_dir(arch.arch),
                     'android-build',
+                    'build',
                     'lib.linux-arm-3.7')
                 module_filens = (glob.glob(join(modules_build_dir, '*.so')) +
                                  glob.glob(join(modules_build_dir, '*.py')))

pythonforandroid/bootstraps/sdl2/build/build.py

@@ -125,7 +125,7 @@ def make_python_zip():
 
     if not exists('private'):
         print('No compiled python is present to zip, skipping.')
-        print('this should only be the case if you are using the CrystaX python')
+        print('this should only be the case if you are using the CrystaX python or python3')
         return
 
     global python_files
@@ -243,6 +243,8 @@ def make_package(args):
         tar_dirs.append('private')
     if exists('crystax_python'):
         tar_dirs.append('crystax_python')
+    if exists('_python_bundle'):
+        tar_dirs.append('_python_bundle')
 
     if args.private:
         make_tar('src/main/assets/private.mp3', tar_dirs, args.ignore_path)

pythonforandroid/bootstraps/sdl2/build/jni/src/start.c

@@ -76,10 +76,9 @@ int main(int argc, char *argv[]) {
   int ret = 0;
   FILE *fd;
 
-  /* AND: Several filepaths are hardcoded here, these must be made
-     configurable */
-  /* AND: P4A uses env vars...not sure what's best */
-  LOGP("Initialize Python for Android");
+  setenv("P4A_BOOTSTRAP", "SDL2", 1);  // env var to identify p4a to applications
+
+  LOGP("Initializing Python for Android");
   env_argument = getenv("ANDROID_ARGUMENT");
   setenv("ANDROID_APP_PATH", env_argument, 1);
   env_entrypoint = getenv("ANDROID_ENTRYPOINT");
@@ -109,32 +108,47 @@ int main(int argc, char *argv[]) {
 
   LOGP("Preparing to initialize python");
 
+  // Set up the python path
+  char paths[256];
+
   char crystax_python_dir[256];
   snprintf(crystax_python_dir, 256,
            "%s/crystax_python", getenv("ANDROID_UNPACK"));
-  if (dir_exists(crystax_python_dir)) {
-    LOGP("crystax_python exists");
-    char paths[256];
-    snprintf(paths, 256,
-             "%s/stdlib.zip:%s/modules",
-             crystax_python_dir, crystax_python_dir);
-    /* snprintf(paths, 256, "%s/stdlib.zip:%s/modules", env_argument,
-     * env_argument); */
-    LOGP("calculated paths to be...");
-    LOGP(paths);
+  char python_bundle_dir[256];
+  snprintf(python_bundle_dir, 256,
+           "%s/_python_bundle", getenv("ANDROID_UNPACK"));
+  if (dir_exists(crystax_python_dir) || dir_exists(python_bundle_dir)) {
+    if (dir_exists(crystax_python_dir)) {
+        LOGP("crystax_python exists");
+        snprintf(paths, 256,
+                "%s/stdlib.zip:%s/modules",
+                crystax_python_dir, crystax_python_dir);
+        LOGP("calculated paths to be...");
+        LOGP(paths);
+    }
+
+    if (dir_exists(python_bundle_dir)) {
+        LOGP("_python_bundle dir exists");
+        snprintf(paths, 256,
+                "%s/stdlib.zip:%s/modules",
+                python_bundle_dir, python_bundle_dir);
+        LOGP("calculated paths to be...");
+        LOGP(paths);
+    }
 
-#if PY_MAJOR_VERSION >= 3
-    wchar_t *wchar_paths = Py_DecodeLocale(paths, NULL);
-    Py_SetPath(wchar_paths);
-#else
-    char *wchar_paths = paths;
-    LOGP("Can't Py_SetPath in python2, so crystax python2 doesn't work yet");
-    exit(1);
-#endif
 
-    LOGP("set wchar paths...");
+    #if PY_MAJOR_VERSION >= 3
+        wchar_t *wchar_paths = Py_DecodeLocale(paths, NULL);
+        Py_SetPath(wchar_paths);
+    #else
+        char *wchar_paths = paths;
+        LOGP("Can't Py_SetPath in python2, so crystax python2 doesn't work yet");
+        exit(1);
+    #endif
+
+        LOGP("set wchar paths...");
   } else {
-    LOGP("crystax_python does not exist");
+      LOGP("crystax_python does not exist");
   }
 
   Py_Initialize();
@@ -174,8 +188,8 @@ int main(int argc, char *argv[]) {
                        "    argument ]\n");
   }
 
+  char add_site_packages_dir[256];
   if (dir_exists(crystax_python_dir)) {
-    char add_site_packages_dir[256];
     snprintf(add_site_packages_dir, 256,
              "sys.path.append('%s/site-packages')",
              crystax_python_dir);
@@ -188,6 +202,19 @@ int main(int argc, char *argv[]) {
     PyRun_SimpleString("sys.path = ['.'] + sys.path");
   }
 
+  if (dir_exists(python_bundle_dir)) {
+    snprintf(add_site_packages_dir, 256,
+             "sys.path.append('%s/site-packages')",
+             python_bundle_dir);
+
+    PyRun_SimpleString("import sys\n"
+                       "sys.argv = ['notaninterpreterreally']\n"
+                       "from os.path import realpath, join, dirname");
+    PyRun_SimpleString(add_site_packages_dir);
+    /* "sys.path.append(join(dirname(realpath(__file__)), 'site-packages'))") */
+    PyRun_SimpleString("sys.path = ['.'] + sys.path");
+  }
+
   PyRun_SimpleString(
       "class LogFile(object):\n"
       "    def __init__(self):\n"
@@ -317,6 +344,7 @@ JNIEXPORT void JNICALL Java_org_kivy_android_PythonService_nativeStart(
   setenv("PYTHONHOME", python_home, 1);
   setenv("PYTHONPATH", python_path, 1);
   setenv("PYTHON_SERVICE_ARGUMENT", arg, 1);
+  setenv("P4A_BOOTSTRAP", "SDL2", 1);
 
   char *argv[] = {"."};
   /* ANDROID_ARGUMENT points to service subdir,

testapps/setup_testapp_python3.py

@@ -6,7 +6,7 @@
                    'requirements': 'sdl2,pyjnius,kivy,python3',
                    'android-api': 19,
                    'ndk-dir': '/home/asandy/android/crystax-ndk-10.3.2',
-                   'dist-name': 'bdisttest_python3',
+                   'dist-name': 'bdisttest_python3_googlendk',
                    'ndk-version': '10.3.2',
                    'arch': 'armeabi-v7a',
                    'permission': 'VIBRATE',
@@ -20,7 +20,7 @@
 print('packages are', packages)
 
 setup(
-    name='testapp_python3',
+    name='testapp_python3_googlendk',
     version='1.1',
     description='p4a setup.py test',
     author='Alexander Taylor',