require build-tools that fully supports apksigner
This commit is contained in:
parent
501a33f117
commit
989159ef09
|
@ -114,7 +114,7 @@ default_config = {
|
||||||
'r16b': None,
|
'r16b': None,
|
||||||
},
|
},
|
||||||
'cachedir': os.path.join(os.getenv('HOME'), '.cache', 'fdroidserver'),
|
'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,
|
'java_paths': None,
|
||||||
'scan_binary': False,
|
'scan_binary': False,
|
||||||
'ant': "ant",
|
'ant': "ant",
|
||||||
|
@ -508,6 +508,7 @@ def test_aapt_version(aapt):
|
||||||
|
|
||||||
def test_sdk_exists(thisconfig):
|
def test_sdk_exists(thisconfig):
|
||||||
if 'sdk_path' not in 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']):
|
if 'aapt' in thisconfig and os.path.isfile(thisconfig['aapt']):
|
||||||
test_aapt_version(thisconfig['aapt'])
|
test_aapt_version(thisconfig['aapt'])
|
||||||
return True
|
return True
|
||||||
|
|
|
@ -78,7 +78,7 @@ class CommonTest(unittest.TestCase):
|
||||||
for f in sorted(os.listdir(build_tools), reverse=True):
|
for f in sorted(os.listdir(build_tools), reverse=True):
|
||||||
versioned = os.path.join(build_tools, f)
|
versioned = os.path.join(build_tools, f)
|
||||||
if os.path.isdir(versioned) \
|
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
|
fdroidserver.common.config['build_tools'] = versioned
|
||||||
break
|
break
|
||||||
return True
|
return True
|
||||||
|
|
Loading…
Reference in New Issue