pygame
diff --git a/‎pythonforandroid/bootstraps/common/build/build.py
Lines changed: 12 additions & 20 deletions b/‎pythonforandroid/bootstraps/common/build/build.py
Lines changed: 12 additions & 20 deletions
diff --git a/‎pythonforandroid/toolchain.py
Lines changed: 9 additions & 10 deletions b/‎pythonforandroid/toolchain.py
Lines changed: 9 additions & 10 deletions
@@ -86,17 +86,10 @@ def get_bootstrap_name():
 environment = jinja2.Environment(loader=jinja2.FileSystemLoader(
     join(curdir, 'templates')))
 
-
-def try_unlink(fn):
-    if exists(fn):
-        os.unlink(fn)
-
-
 def ensure_dir(path):
     if not exists(path):
         makedirs(path)
 
-
 def render(template, dest, **kwargs):
     '''Using jinja2, render `template` to the filename `dest`, supplying the
 
@@ -239,10 +232,8 @@ def make_package(args):
     assets_dir = "src/main/assets"
 
     # Delete the old assets.
-    if os.path.exists(assets_dir):
-        shutil.rmtree(assets_dir)
+    shutil.rmtree(assets_dir, ignore_errors=True)
     ensure_dir(assets_dir)
-    open(os.path.join(assets_dir, ".gitkeep"), 'a').close()
 
     # Add extra environment variable file into tar-able directory:
     env_vars_tarpath = tempfile.mkdtemp(prefix="p4a-extra-env-")
@@ -305,14 +296,14 @@ def make_package(args):
                 tar_dirs.append(python_bundle_dir)
         if get_bootstrap_name() == "webview":
             tar_dirs.append('webview_includes')
-        if hasattr(args, "assets") and args.assets is not None:
-            for asset in args.assets:
-                asset_src, asset_dest = asset.split(":")
-                if isfile(realpath(asset_src)):
-                    ensure_dir(dirname(join(assets_dir, asset_dest)))
-                    shutil.copy(realpath(asset_src), join(assets_dir, asset_dest))
-                else:
-                    shutil.copytree(realpath(asset_src), join(assets_dir, asset_dest))
+
+        for asset in args.assets:
+            asset_src, asset_dest = asset.split(":")
+            if isfile(realpath(asset_src)):
+                ensure_dir(dirname(join(assets_dir, asset_dest)))
+                shutil.copy(realpath(asset_src), join(assets_dir, asset_dest))
+            else:
+                shutil.copytree(realpath(asset_src), join(assets_dir, asset_dest))
 
         if args.private or args.launcher:
             make_tar(
@@ -609,8 +600,9 @@ def parse_args_and_make_package(args=None):
     ap.add_argument('--uses-library', dest='android_used_libs', action='append', default=[],
                     help='Used shared libraries included using <uses-library> tag in AndroidManifest.xml')
     ap.add_argument('--asset', dest='assets',
-                    action="append",
-                    help=('Put this in the assets folder'))
+                    action="append", default=[],
+                    metavar="/path/to/source:dest"
+                    help='Put this in the assets folder at assets/dest')
     ap.add_argument('--icon', dest='icon',
                     help=('A png file to use as the icon for '
                           'the application.'))
 
@@ -496,8 +496,8 @@ def add_parser(subparsers, *args, **kwargs):
         # is why we also add it here:
         parser_apk.add_argument(
             '--add-asset', dest='assets',
-            action="append",
-            help=('Put this in the assets folder'))
+            action="append", default=[],
+            help='Put this in the assets folder in the apk.')
         parser_apk.add_argument(
             '--private', dest='private',
             help='the directory with the app source code files' +
@@ -586,14 +586,13 @@ def add_parser(subparsers, *args, **kwargs):
             args.unknown_args += ["--private", args.private]
         if hasattr(args, "build_mode") and args.build_mode == "release":
             args.unknown_args += ["--release"]
-        if hasattr(args, "assets") and args.assets is not None:
-            # Pass this value on to the internal bootstrap build.py:
-            for asset in args.assets:
-                if ":" in asset:
-                    asset_src, asset_dest = asset.split(":")
-                else:
-                    asset_src = asset_dest = asset
-                args.unknown_args += ["--asset", os.path.abspath(asset_src)+":"+asset_dest]
+        for asset in args.assets:
+            if ":" in asset:
+                asset_src, asset_dest = asset.split(":")
+            else:
+                asset_src = asset_dest = asset
+            # take abspath now, because build.py will be run in bootstrap dir
+            args.unknown_args += ["--asset", os.path.abspath(asset_src)+":"+asset_dest]
         if hasattr(args, "ignore_setup_py") and args.ignore_setup_py:
             args.use_setup_py = False