Merge pull request #1499 from JonasT/bootstrapminorfix

Minor fixes to basic common bootstrap handling code

pythonforandroid/bootstrap.py

@@ -1,4 +1,4 @@
-from os.path import (join, dirname, isdir, splitext, basename)
+from os.path import (join, dirname, isdir, normpath, splitext, basename)
 from os import listdir, walk, sep
 import sh
 import glob
@@ -16,8 +16,8 @@
 def copy_files(src_root, dest_root, override=True):
     for root, dirnames, filenames in walk(src_root):
         for filename in filenames:
-            subdir = root.replace(src_root, "")
-            if subdir.startswith(sep):
+            subdir = normpath(root.replace(src_root, ""))
+            if subdir.startswith(sep):  # ensure it is relative
                 subdir = subdir[1:]
             dest_dir = join(dest_root, subdir)
             if not os.path.exists(dest_dir):

pythonforandroid/toolchain.py

@@ -141,9 +141,6 @@ def wrapper_func(self, args):
                                       user_ndk_ver=self.ndk_version,
                                       user_ndk_api=self.ndk_api)
         dist = self._dist
-        bs = Bootstrap.get_bootstrap(args.bootstrap, ctx)
-        # recipes rarely change, but during dev, bootstraps can change from
-        # build to build, so run prepare_bootstrap even if needs_build is false
         if dist.needs_build:
             if dist.folder_exists():  # possible if the dist is being replaced
                 dist.delete()