kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-20 13:50:12 +01:00
Code Activity

Merge branch 'fix_532' into 'master'

Browse Source 
Fix 532

Closes #532

See merge request fdroid/fdroidserver!541
This commit is contained in:
Marcus 2018-07-25 18:11:56 +00:00
commit 2aaa097962
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fdroidserver/scanner.py
View File

@ -21,6 +21,7 @@ import re
import traceback
from argparse import ArgumentParser
import logging
import itertools
from . import _
from . import common
@ -33,24 +34,19 @@ options = None
def get_gradle_compile_commands(build):
compileCommands = ['compile',
'provided'
'apk'
'implementation'
'api'
'compileOnly'
'runtimeOnly',
'releaseCompile'
'releaseProvided'
'releaseApk'
'releaseImplementation'
'releaseApi'
'releaseCompileOnly'
'releaseRuntimeOnly']
'provided',
'apk',
'implementation',
'api',
'compileOnly',
'runtimeOnly']
buildTypes = ['', 'release']
flavors = ['']
if build.gradle and build.gradle != ['yes']:
compileCommands += [flavor + 'Compile' for flavor in build.gradle]
compileCommands += [flavor + 'ReleaseCompile' for flavor in build.gradle]
flavors += build.gradle
return [re.compile(r'\s*' + c, re.IGNORECASE) for c in compileCommands]
commands = [''.join(c) for c in itertools.product(flavors, buildTypes, compileCommands)]
return [re.compile(r'\s*' + c, re.IGNORECASE) for c in commands]
def scan_source(build_dir, build=metadata.Build()):