mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 23:10:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Centralise handling of default gradle flavours

Browse source
This commit is contained in:
Daniel Martí 2014-09-13 13:04:24 +02:00
parent a195556378
commit 34a3405208
4 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
fdroidserver/common.py
View file

@ -833,10 +833,9 @@ def manifest_paths(app_dir, flavours):
os.path.join(app_dir, 'src', 'AndroidManifest.xml'),
os.path.join(app_dir, 'build.gradle')]
if flavours:
for flavour in flavours:
possible_manifests.append(
os.path.join(app_dir, 'src', flavour, 'AndroidManifest.xml'))
for flavour in flavours:
possible_manifests.append(
os.path.join(app_dir, 'src', flavour, 'AndroidManifest.xml'))
return [path for path in possible_manifests if os.path.isfile(path)]
@ -1210,11 +1209,9 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
f.write(props)
f.close()
flavours = None
flavours = []
if build['type'] == 'gradle':
flavours = build['gradle']
if len(flavours) == 1 and flavours[0] in ['main', 'yes', '']:
flavours = None
version_regex = re.compile(r".*'com\.android\.tools\.build:gradle:([^\.]+\.[^\.]+).*'.*")
gradlepluginver = None