build: don't add extra clean tasks

[fdroidserver.git] / fdroidserver / build.py

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 19df721568a113c969d0ead27b5d22bc157717ba..463e60573abe4afff1ee088eb82ea75200194de7 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -526,11 +526,6 @@ def build_local(app, build, vcs, build_dir, output_dir, srclib_dir, extlib_dir,
         if build.gradleprops:
             cmd += ['-P'+kv for kv in build.gradleprops]
 
-        for task in gradletasks:
-            parts = task.split(':')
-            parts[-1] = 'clean' + capitalize_intact(parts[-1])
-            cmd += [':'.join(parts)]
-
         cmd += ['clean']
 
         p = FDroidPopen(cmd, cwd=root_dir)
@@ -789,13 +784,16 @@ def build_local(app, build, vcs, build_dir, output_dir, srclib_dir, extlib_dir,
                 os.path.join(root_dir, 'build', 'outputs', 'apk'),
                 os.path.join(root_dir, 'build', 'apk'),
                 ]:
-            apks = glob.glob(os.path.join(apks_dir, '*-release-unsigned.apk'))
-
-            if len(apks) > 1:
-                raise BuildException('More than one resulting apks found in %s' % apks_dir,
-                                     '\n'.join(apks))
-            if len(apks) == 1:
-                src = apks[0]
+            for apkglob in ['*-release-unsigned.apk', '*-unsigned.apk', '*.apk']:
+                apks = glob.glob(os.path.join(apks_dir, apkglob))
+
+                if len(apks) > 1:
+                    raise BuildException('More than one resulting apks found in %s' % apks_dir,
+                                         '\n'.join(apks))
+                if len(apks) == 1:
+                    src = apks[0]
+                    break
+            if src is not None:
                 break
 
         if src is None: