LBRYCommunity/buildozer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #978 from misl6/fix-dist-dir

Browse source 
Fixes packaging for current p4a develop branch
This commit is contained in:
Andre Miras 2019-10-01 10:44:11 +02:00 committed by GitHub
commit d483847bb5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
buildozer/targets/android.py
View file

@ -789,7 +789,7 @@ class TargetAndroid(Target):
return True return True
def get_dist_dir(self, dist_name): def get_dist_dir(self, dist_name):
return join(self._build_dir, 'dists', dist_name) return join(self._build_dir, 'dists', "{}__{}".format(dist_name, self._arch))
def get_local_recipes_dir(self): def get_local_recipes_dir(self):
local_recipes = self.buildozer.config.getdefault('app', 'p4a.local_recipes') local_recipes = self.buildozer.config.getdefault('app', 'p4a.local_recipes')
@ -1128,8 +1128,8 @@ class TargetAndroid(Target):
if is_gradle_build: if is_gradle_build:
# on gradle build, the apk use the package name, and have no version # on gradle build, the apk use the package name, and have no version
apk = u'{packagename}-{mode}.apk'.format( apk = u'{packagename}__{arch}-{mode}.apk'.format(
packagename=packagename, mode=mode) packagename=packagename, arch=self._arch, mode=mode)
apk_dir = join(dist_dir, "build", "outputs", "apk", mode_sign) apk_dir = join(dist_dir, "build", "outputs", "apk", mode_sign)
else: else:
# on ant, the apk use the title, and have version # on ant, the apk use the title, and have version