Refactor apk_dest code to prevent code duplication.

kivy · Sep 11, 2019 · c92b3ef · c92b3ef
1 parent 581a1ba
commit c92b3ef
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/buildozer/targets/android.py b/buildozer/targets/android.py
@@ -1127,11 +1127,6 @@ def build_package(self):
             apk = u'{packagename}-{mode}.apk'.format(
                 packagename=packagename, mode=mode)
             apk_dir = join(dist_dir, "build", "outputs", "apk", mode_sign)
-
-            apk_dest = u'{packagename}-{version}-{arch}-{mode}.apk'.format(
-                packagename=packagename, mode=mode, version=version,
-                arch=self._arch)
-
         else:
             # on ant, the apk use the title, and have version
             bl = u'\'" ,'
@@ -1144,12 +1139,11 @@ def build_package(self):
                 version=version,
                 mode=mode)
             apk_dir = join(dist_dir, "bin")
-            apk_dest = apk
-
             packagename = config.get('app', 'package.name')
-            apk_dest = u'{packagename}-{version}-{arch}-{mode}.apk'.format(
-                packagename=packagename, mode=mode, version=version,
-                arch=self._arch)
+
+        apk_dest = u'{packagename}-{version}-{arch}-{mode}.apk'.format(
+            packagename=packagename, mode=mode, version=version,
+            arch=self._arch)
 
         # copy to our place
         copyfile(join(apk_dir, apk), join(self.buildozer.bin_dir, apk_dest))