mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 22:42:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

add comments to gradle output directories

Browse source
This commit is contained in:
Marcus Hoffmann 2017-08-26 17:03:13 +02:00
parent b114b44020
commit b148b82f83
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fdroidserver/build.py
View file

@ -803,10 +803,16 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext
elif omethod == 'gradle': elif omethod == 'gradle':
src = None src = None
apk_dirs = [ apk_dirs = [
# gradle plugin >= 3.0
os.path.join(root_dir, 'build', 'outputs', 'apk', 'release'), os.path.join(root_dir, 'build', 'outputs', 'apk', 'release'),
# gradle plugin < 3.0 and >= 0.11
os.path.join(root_dir, 'build', 'outputs', 'apk'), os.path.join(root_dir, 'build', 'outputs', 'apk'),
# really old path
os.path.join(root_dir, 'build', 'apk'), os.path.join(root_dir, 'build', 'apk'),
] ]
# If we build with gradle flavours with gradle plugin >= 3.0 the apk will be in
# a subdirectory corresponding to the flavour command used, but with different
# capitalization.
if flavours_cmd: if flavours_cmd:
apk_dirs.append(os.path.join(root_dir, 'build', 'outputs', 'apk', transform_first_char(flavours_cmd, str.lower), 'release')) apk_dirs.append(os.path.join(root_dir, 'build', 'outputs', 'apk', transform_first_char(flavours_cmd, str.lower), 'release'))
for apks_dir in apk_dirs: for apks_dir in apk_dirs: