From dfc10b64fc2ea61c9abb86e31bbc8fd9a36a1978 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Sat, 17 Aug 2013 14:23:34 +0200 Subject: [PATCH] Fix gradle resulting apk path --- fdroidserver/build.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index 86ca309e..672a06cf 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -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) -- 2.30.2