Revert "optimize copy of bootstrap"

This reverts commit 6813d66.

Author: T-Dynamos

pythonforandroid/bootstrap.py

@@ -7,7 +7,6 @@
 import sh
 import shlex
 import shutil
-from pathlib import Path
 
 from pythonforandroid.logger import (shprint, info, info_main, logger, debug)
 from pythonforandroid.util import (
@@ -41,36 +40,6 @@ def copy_files(src_root, dest_root, override=True, symlink=False):
                 os.makedirs(dest_file)
 
 
-def copytree_filtered(src, dst, skip_dirs=None):
-    """
-    Copy directory tree while skipping explicitly specified directories in src.
-    """
-
-    info(f"Copying {src} to {dst} with skip dirs: {skip_dirs}")
-
-    src = Path(src)
-    dst = Path(dst)
-    skip_dirs = set(Path(p) for p in (skip_dirs or []))
-
-    def should_skip(rel_path):
-        # match exact directory path only
-        return any(rel_path == skip or skip in rel_path.parents for skip in skip_dirs)
-
-    for item in src.rglob("*"):
-        rel = item.relative_to(src)
-
-        if should_skip(rel):
-            continue
-
-        target = dst / rel
-
-        if item.is_dir():
-            target.mkdir(parents=True, exist_ok=True)
-        else:
-            target.parent.mkdir(parents=True, exist_ok=True)
-            shutil.copy2(item, target)
-
-
 default_recipe_priorities = [
     "webview", "sdl2", "sdl3", "service_only"  # last is highest
 ]
@@ -122,10 +91,6 @@ class Bootstrap:
     from Bootstrap.get_bootstrap_from_recipes.
     '''
 
-    # Directories to exclude during copy (relative to src root).
-    # Used to reduce final build size and exclude unnecessary sources for final build.
-    skip_dirs = []
-
     # Other things a Bootstrap might need to track (maybe separately):
     # ndk_main.c
     # whitelist.txt
@@ -246,7 +211,7 @@ def assemble_distribution(self):
         info_main(f'# Creating Android project ({self.name})')
 
         rmdir(self.dist_dir)
-        copytree_filtered(self.build_dir, self.dist_dir, skip_dirs=self.skip_dirs)
+        shprint(sh.cp, '-r', self.build_dir, self.dist_dir)
 
         with current_directory(self.dist_dir):
             with open('local.properties', 'w') as fileh:

pythonforandroid/bootstraps/_sdl_common/__init__.py

@@ -9,8 +9,6 @@ class SDLGradleBootstrap(Bootstrap):
 
     recipe_depends = []
 
-    skip_dirs = ["jni"]
-
     def _assemble_distribution_for_arch(self, arch):
         """SDL bootstrap skips distribute_aars() - handled differently."""
         self.distribute_libs(arch, [self.ctx.get_libs_dir(arch.arch)])

pythonforandroid/recipes/kivy/__init__.py

@@ -25,7 +25,7 @@ def is_kivy_affected_by_deadlock_issue(recipe=None, arch=None):
 def is_kivy_less_than_3(recipe=None, arch=None):
     return packaging.version.parse(
         str(get_kivy_version(recipe, arch))
-    ) < packaging.version.Version("3.0.0.dev0")
+    ) < packaging.version.Version("3.0.0")
 
 
 class KivyRecipe(PyProjectRecipe):