Copy files to bin/.

android.py

@@ -29,11 +29,6 @@ def main():
 
     args = ap.parse_args()
 
-    if not pygame_sdl2.display.get_init():
-        pygame_sdl2.display.init()
-        pygame_sdl2.display.set_mode((640, 480))
-        pygame_sdl2.event.pump()
-
     iface = interface.Interface()
 
     def check_args(n):

buildlib/rapt/build.py

@@ -421,9 +421,12 @@ def make_assets():
 
     iface.background(make_assets)
 
+    if not os.path.exists(plat.path("bin")):
+        os.mkdir(plat.path("bin"), 0o777)
+
     if config.expansion:
         iface.info("Creating expansion file.")
-        expansion_file = "main.{}.{}.obb".format(config.numeric_version, config.package)
+        expansion_file = "bin/main.{}.{}.obb".format(config.numeric_version, config.package)
 
         def make_expansion():
 
@@ -513,13 +516,41 @@ def pack():
             dest = "/storage/emulated/0/Android/data/{}/{}".format(config.package, expansion_file)
             iface.call([ plat.adb, "push", plat.path(expansion_file), dest ], cancel=True)
 
-#         if expansion_file is not None:
-#             plat.rename(plat.path(expansion_file), plat.path("bin/" + expansion_file))
-#             files.append(plat.path("bin/" + expansion_file))
+        if expansion_file is not None:
+            files.append(plat.path(expansion_file))
 
     except subprocess.CalledProcessError:
         iface.fail("The build seems to have failed.")
 
+    # Copy everything to bin.
+    apkdirs = [ ]
+
+    if any(i.endswith("Debug") for i in commands):
+        apkdirs.append(plat.path("project/app/build/outputs/apk/debug"))
+
+    if any(i.endswith("Release") for i in commands):
+        apkdirs.append(plat.path("project/app/build/outputs/apk/release"))
+
+    for i in apkdirs:
+        for j in os.listdir(i):
+
+            if not j.endswith(".apk"):
+                continue
+
+            sfn = os.path.join(i, j)
+
+            dfn = "bin/{}-{}-{}".format(
+                config.package,
+                config.numeric_version,
+                j[4:])
+
+            dfn = plat.path(dfn)
+
+            shutil.copy(sfn, dfn)
+            files.append(dfn)
+
+    # Launch.
+
     if launch:
         iface.info("Launching app.")
 

buildlib/rapt/iconmaker.py

@@ -8,6 +8,11 @@ class IconMaker(object):
 
     def __init__(self, directory):
 
+        if not pygame_sdl2.display.get_surface():
+            pygame_sdl2.display.init()
+            pygame_sdl2.display.set_mode((640, 480))
+            pygame_sdl2.event.pump()
+
         self.directory = directory
 
         sizes = [