mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-17 10:40:12 +02:00
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.
This commit is contained in:
parent
9e09088245
commit
03b54e8506
@ -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',
|
's@compileSdkVersion[ ]*[0-9]*@compileSdkVersion '+level+'@g',
|
||||||
'build.gradle'], cwd=gradle_dir)
|
'build.gradle'], cwd=gradle_dir)
|
||||||
|
|
||||||
for root, dirs, files in os.walk(gradle_dir):
|
for root, dirs, files in os.walk(build_dir):
|
||||||
root = os.path.relpath(root, gradle_dir)
|
|
||||||
for f in files:
|
for f in files:
|
||||||
if f == 'build.gradle':
|
if f == 'build.gradle':
|
||||||
adapt_gradle(os.path.join(gradle_dir, root, f), verbose)
|
adapt_gradle(os.path.join(root, f), verbose)
|
||||||
continue
|
break
|
||||||
|
|
||||||
if flavour in ['main', 'yes', '']:
|
if flavour in ['main', 'yes', '']:
|
||||||
flavour = ''
|
flavour = ''
|
||||||
|
Loading…
Reference in New Issue
Block a user