New gradle=[flavour] field

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index e51716b2197e62db3faaad0d0be0c666df9c2d46..94835efcbb51e446ff4ddc2c4fd5f25c869e431d 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -415,6 +415,9 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
         if 'mvnflags' in thisbuild:
             mvncmd += thisbuild['mvnflags']
         p = subprocess.Popen(mvncmd, cwd=root_dir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    elif 'gradle' in thisbuild:
+        flavour = thisbuild['gradle']
+        p = subprocess.Popen(gradle, 'assemble'+flavour+'Release', cwd=root_dir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     else:
         if install:
             antcommands = ['debug','install']

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index a363ffb504e125e5c286c712651f7f1c6b11e14f..8baa502f3847d2005bfc884f568e6bdb1bf736a6 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1133,7 +1133,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, sdk_path,
     # Generate (or update) the ant build file, build.xml...
     updatemode = build.get('update', '.')
     if (updatemode != 'no' and
-        'maven' not in build):
+        'maven' not in build and 'gradle' not in build):
         parms = [os.path.join(sdk_path, 'tools', 'android'),
                 'update', 'project', '-p', '.']
         parms.append('--subprojects')