1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-13 02:30:11 +01:00

Fix gradle resulting apk path

This commit is contained in:
Daniel Martí 2013-08-17 14:23:34 +02:00
parent 562f539e96
commit dfc10b64fc

View File

@ -488,7 +488,9 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
src = m.group(1)
src = os.path.join(bindir, src) + '.apk'
elif 'gradle' in thisbuild:
src = os.path.join(build_dir, 'build', 'apk', '-'.join([app['id'], flavour, 'release', 'unsigned'])+'.apk')
if 'subdir' in thisbuild:
build_dir = os.path.join(build_dir, thisbuild['subdir'])
src = os.path.join(build_dir, 'build', 'apk', '-'.join([os.path.basename(build_dir), flavour, 'release', 'unsigned'])+'.apk')
else:
src = re.match(r".*^.*Creating (.+) for release.*$.*", output,
re.S|re.M).group(1)