rename final apk with arch in the name

This commit is contained in:
Mathieu Virbel 2019-09-08 23:44:56 +02:00 committed by Mathieu Virbel
parent e95844e1b3
commit 581a1ba2da

View file

@ -1127,8 +1127,10 @@ class TargetAndroid(Target):
apk = u'{packagename}-{mode}.apk'.format( apk = u'{packagename}-{mode}.apk'.format(
packagename=packagename, mode=mode) packagename=packagename, mode=mode)
apk_dir = join(dist_dir, "build", "outputs", "apk", mode_sign) apk_dir = join(dist_dir, "build", "outputs", "apk", mode_sign)
apk_dest = u'{packagename}-{version}-{mode}.apk'.format(
packagename=packagename, mode=mode, version=version) apk_dest = u'{packagename}-{version}-{arch}-{mode}.apk'.format(
packagename=packagename, mode=mode, version=version,
arch=self._arch)
else: else:
# on ant, the apk use the title, and have version # on ant, the apk use the title, and have version
@ -1144,6 +1146,11 @@ class TargetAndroid(Target):
apk_dir = join(dist_dir, "bin") apk_dir = join(dist_dir, "bin")
apk_dest = apk 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)
# copy to our place # copy to our place
copyfile(join(apk_dir, apk), join(self.buildozer.bin_dir, apk_dest)) copyfile(join(apk_dir, apk), join(self.buildozer.bin_dir, apk_dest))