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

refactor packagename to prevent code duplication

Browse source
This commit is contained in:
Mathieu Virbel 2019-09-11 19:58:16 +02:00 committed by Mathieu Virbel
parent c92b3ef925
commit 2af534652d
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
buildozer/targets/android.py
View file

@ -1120,10 +1120,10 @@ class TargetAndroid(Target):
gradle_files = ["build.gradle", "gradle", "gradlew"] gradle_files = ["build.gradle", "gradle", "gradlew"]
is_gradle_build = build_tools_version >= "25.0" and any( is_gradle_build = build_tools_version >= "25.0" and any(
(exists(join(dist_dir, x)) for x in gradle_files)) (exists(join(dist_dir, x)) for x in gradle_files))
packagename = config.get('app', 'package.name')
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
packagename = config.get('app', 'package.name')
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)
@ -1139,7 +1139,6 @@ class TargetAndroid(Target):
version=version, version=version,
mode=mode) mode=mode)
apk_dir = join(dist_dir, "bin") apk_dir = join(dist_dir, "bin")
packagename = config.get('app', 'package.name')
apk_dest = u'{packagename}-{version}-{arch}-{mode}.apk'.format( apk_dest = u'{packagename}-{version}-{arch}-{mode}.apk'.format(
packagename=packagename, mode=mode, version=version, packagename=packagename, mode=mode, version=version,