opensourcemirror
/
fdroid-server
mirror of https://gitlab.com/fdroid/fdroidserver.git
1
0
Fork 0
Code Issues Releases Wiki Activity

require build-tools that fully supports apksigner

This commit is contained in:
Hans-Christoph Steiner 2020-10-14 18:44:25 +02:00
parent 501a33f117
commit 989159ef09
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fdroidserver/common.py
View File

@ -114,7 +114,7 @@ default_config = {
'r16b': None,
},
'cachedir': os.path.join(os.getenv('HOME'), '.cache', 'fdroidserver'),
'build_tools': MINIMUM_AAPT_BUILD_TOOLS_VERSION,
'build_tools': MINIMUM_APKSIGNER_BUILD_TOOLS_VERSION,
'java_paths': None,
'scan_binary': False,
'ant': "ant",
@ -508,6 +508,7 @@ def test_aapt_version(aapt):
def test_sdk_exists(thisconfig):
if 'sdk_path' not in thisconfig:
# TODO convert this to apksigner once it is required
if 'aapt' in thisconfig and os.path.isfile(thisconfig['aapt']):
test_aapt_version(thisconfig['aapt'])
return True

2
tests/common.TestCase
View File

@ -78,7 +78,7 @@ class CommonTest(unittest.TestCase):
for f in sorted(os.listdir(build_tools), reverse=True):
versioned = os.path.join(build_tools, f)
if os.path.isdir(versioned) \
and os.path.isfile(os.path.join(versioned, 'aapt')):
and os.path.isfile(os.path.join(versioned, 'apksigner')):
fdroidserver.common.config['build_tools'] = versioned
break
return True