From c92b3ef9253e60f8a622844a045f4689b9296d1e Mon Sep 17 00:00:00 2001 From: Mathieu Virbel Date: Wed, 11 Sep 2019 18:38:06 +0200 Subject: [PATCH] Refactor apk_dest code to prevent code duplication. --- buildozer/targets/android.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/buildozer/targets/android.py b/buildozer/targets/android.py index 2b779a7c3..e0e4604fe 100644 --- 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))