From 03b54e850685125ffb98d7471bab0b7d28f6de96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Sun, 1 Sep 2013 11:56:57 +0200 Subject: [PATCH] Fixes to gradle builds It now adapts/seds all build.gradle files under build_dir, i.e. the root dir (even if subdir is used). This is very necessary when libraries are under parent directories or when a father build.gradle file exists. --- fdroidserver/build.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index 6b1c41d0..4ceb70e7 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -466,12 +466,11 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d 's@compileSdkVersion[ ]*[0-9]*@compileSdkVersion '+level+'@g', 'build.gradle'], cwd=gradle_dir) - for root, dirs, files in os.walk(gradle_dir): - root = os.path.relpath(root, gradle_dir) + for root, dirs, files in os.walk(build_dir): for f in files: if f == 'build.gradle': - adapt_gradle(os.path.join(gradle_dir, root, f), verbose) - continue + adapt_gradle(os.path.join(root, f), verbose) + break if flavour in ['main', 'yes', '']: flavour = ''