kivy: fix build

Author: T-Dynamos

pythonforandroid/build.py

@@ -150,6 +150,7 @@ def setup_dirs(self, storage_dir):
         self.build_dir = join(self.storage_dir, 'build')
         self.dist_dir = join(self.storage_dir, 'dists')
         self.prebuilt_dir = join(self.storage_dir, 'output')
+        self.ensure_dirs()
 
     def ensure_dirs(self):
         ensure_dir(self.storage_dir)
@@ -226,8 +227,6 @@ def prepare_build_environment(self,
 
         '''
 
-        self.ensure_dirs()
-
         if self._build_env_prepared:
             return
 

pythonforandroid/recipe.py

@@ -516,7 +516,7 @@ def unpack(self, arch):
                     for entry in listdir(extraction_filename):
                         # Previously we filtered out the .git folder, but during the build process for some recipes
                         # (e.g. when version is parsed by `setuptools_scm`) that may be needed.
-                        shprint(sh.cp, '-Rv',
+                        shprint(sh.cp, '-R',
                                 join(extraction_filename, entry),
                                 directory_name)
                 else:
@@ -1048,8 +1048,9 @@ def install_hostpython_prerequisites(self, packages=None, force_upgrade=True, ar
         ]
         if force_upgrade:
             pip_options.append("--upgrade")
-        # Use system's pip
-        shprint(sh.Command(self.real_hostpython_location), "-m", "pip", *pip_options, _env=self.get_hostrecipe_env())
+        pip_env = self.get_hostrecipe_env()
+        pip_env["HOME"] = "?"
+        shprint(sh.Command(self.real_hostpython_location), "-m", "pip", *pip_options, _env=pip_env)
 
     def restore_hostpython_prerequisites(self, packages):
         _packages = []

pythonforandroid/recipebuild.py

@@ -17,15 +17,18 @@ class RecipeBuilder:
     def __init__(self, parsed_args):
         setup_color(True)
         self.build_dir = parsed_args.workdir
-        self.init_context()
-        self.build_recipes(set(parsed_args.recipes + DEFAULT_RECIPES), set(parsed_args.arch))
+        self.init_context(parsed_args)
+        self.build_recipes(
+            set(parsed_args.recipes + DEFAULT_RECIPES),
+            set(parsed_args.arch)
+        )
 
-    def init_context(self):
+    def init_context(self, parse_args):
         self.ctx = Context()
         self.ctx.save_prebuilt = True
         self.ctx.setup_dirs(self.build_dir)
-        self.ctx.ndk_api = 24
-        self.ctx.android_api = 24
+        self.ctx.ndk_api = parse_args.min_api
+        self.ctx.android_api = parse_args.target_api
         self.ctx.ndk_dir = "/home/tdynamos/.buildozer/android/platform/android-ndk-r25b"
 
     def build_recipes(self, recipes, archs):
@@ -70,11 +73,11 @@ def build_recipes(self, recipes, archs):
                     info("{} said it is already built, skipping".format(recipe.name))
                 recipe.install_libraries(arch)
 
-                # input()
-
 if __name__ == "__main__":
     parser = ArgumentParser(description="Build and package recipes.")
     parser.add_argument('-r', '--recipes', nargs='+', help='Recipes to build.', required=True)
     parser.add_argument('-a', '--arch', nargs='+', help='Android arch(s) to build.', required=True)
     parser.add_argument('-w', '--workdir', type=str, help="Workdir for building recipes.", required=True)
+    parser.add_argument('-m', '--min-api', type=int, help="Android ndk (minimum) api.", default=24)
+    parser.add_argument('-t', '--target-api', type=int, help="Android target api.", default=24)
     RecipeBuilder(parser.parse_args())

pythonforandroid/recipes/genericndkbuild/__init__.py

@@ -1,5 +1,5 @@
 from os.path import join
-
+from multiprocessing import cpu_count
 from pythonforandroid.recipe import BootstrapNDKRecipe
 from pythonforandroid.toolchain import current_directory, shprint
 import sh
@@ -29,7 +29,7 @@ def build_arch(self, arch):
         env = self.get_recipe_env(arch)
 
         with current_directory(self.get_jni_dir()):
-            shprint(sh.Command(join(self.ctx.ndk_dir, "ndk-build")), "V=1", _env=env)
+            shprint(sh.Command(join(self.ctx.ndk_dir, "ndk-build")), "V=1", "-j", str(cpu_count()), _env=env)
 
 
 recipe = GenericNDKBuildRecipe()

pythonforandroid/recipes/hostpython3/__init__.py

@@ -159,7 +159,9 @@ def build_arch(self, arch):
 
         ensure_dir(self.site_root)
         self.ctx.hostpython = self.python_exe
-        shprint(sh.Command(self.python_exe), "-m", "ensurepip", "--root", self.site_root, "-U")
-
+        shprint(
+            sh.Command(self.python_exe), "-m", "ensurepip", "--root", self.site_root, "-U", 
+            _env={"HOME":"?"} # need to hack HOME a bit
+        )
 
 recipe = HostPython3Recipe()

pythonforandroid/recipes/kivy/__init__.py

@@ -4,67 +4,25 @@
 import packaging.version
 
 import sh
-from pythonforandroid.recipe import CythonRecipe
+from pythonforandroid.recipe import PyProjectRecipe
 from pythonforandroid.toolchain import current_directory, shprint
 
 
-def is_kivy_affected_by_deadlock_issue(recipe=None, arch=None):
-    with current_directory(join(recipe.get_build_dir(arch.arch), "kivy")):
-        kivy_version = shprint(
-            sh.Command(sys.executable),
-            "-c",
-            "import _version; print(_version.__version__)",
-        )
-
-        return packaging.version.parse(
-            str(kivy_version)
-        ) < packaging.version.Version("2.2.0.dev0")
-
-
-class KivyRecipe(CythonRecipe):
-    version = '2.3.0'
+class KivyRecipe(PyProjectRecipe):
+    version = 'master'
     url = 'https://github.com/kivy/kivy/archive/{version}.zip'
-    name = 'kivy'
-
-    depends = ['sdl2', 'pyjnius', 'setuptools']
+    depends = ['sdl2', 'pyjnius']
     python_depends = ['certifi', 'chardet', 'idna', 'requests', 'urllib3']
-
-    # sdl-gl-swapwindow-nogil.patch is needed to avoid a deadlock.
-    # See: https://github.com/kivy/kivy/pull/8025
-    # WARNING: Remove this patch when a new Kivy version is released.
-    patches = [("sdl-gl-swapwindow-nogil.patch", is_kivy_affected_by_deadlock_issue)]
-
-    def cythonize_build(self, env, build_dir='.'):
-        super().cythonize_build(env, build_dir=build_dir)
-
-        if not exists(join(build_dir, 'kivy', 'include')):
-            return
-
-        # If kivy is new enough to use the include dir, copy it
-        # manually to the right location as we bypass this stage of
-        # the build
-        with current_directory(build_dir):
-            build_libs_dirs = glob.glob(join('build', 'lib.*'))
-
-            for dirn in build_libs_dirs:
-                shprint(sh.cp, '-r', join('kivy', 'include'),
-                        join(dirn, 'kivy'))
-
-    def cythonize_file(self, env, build_dir, filename):
-        # We can ignore a few files that aren't important to the
-        # android build, and may not work on Android anyway
-        do_not_cythonize = ['window_x11.pyx', ]
-        if basename(filename) in do_not_cythonize:
-            return
-        super().cythonize_file(env, build_dir, filename)
-
-    def get_recipe_env(self, arch):
-        env = super().get_recipe_env(arch)
+    
+    def get_recipe_env(self, arch, **kwargs):
+        env = super().get_recipe_env(arch, **kwargs)
         # NDKPLATFORM is our switch for detecting Android platform, so can't be None
         env['NDKPLATFORM'] = "NOTNONE"
+        env['LIBLINK'] = "NOTNONE"
         if 'sdl2' in self.ctx.recipe_build_order:
             env['USE_SDL2'] = '1'
             env['KIVY_SPLIT_EXAMPLES'] = '1'
+            sdl_recipe = self.get_recipe("sdl2", self.ctx)
             sdl2_mixer_recipe = self.get_recipe('sdl2_mixer', self.ctx)
             sdl2_image_recipe = self.get_recipe('sdl2_image', self.ctx)
             env['KIVY_SDL2_PATH'] = ':'.join([
@@ -73,7 +31,7 @@ def get_recipe_env(self, arch):
                 *sdl2_mixer_recipe.get_include_dirs(arch),
                 join(self.ctx.bootstrap.build_dir, 'jni', 'SDL2_ttf'),
             ])
-
+            env["LDFLAGS"] += " -L" + join(sdl_recipe.get_build_dir(arch.arch), "../..", "libs", arch.arch)
         return env
 
 

pythonforandroid/recipes/kivy/sdl-gl-swapwindow-nogil.patch

@@ -309,7 +309,7 @@ def add_flags(include_flags, link_dirs, link_libs):
             )
         env['ZLIB_VERSION'] = line.replace('#define ZLIB_VERSION ', '')
         add_flags(' -I' + zlib_includes, ' -L' + zlib_lib_path, ' -lz')
-
+        
         return env
 
     def build_arch(self, arch):