mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-16 07:52:35 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Also find zipalign at the start

Browse source
This commit is contained in:
Daniel Martí 2014-07-03 00:31:10 +02:00
parent d110c24eff
commit d73f2b9368
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fdroidserver/common.py
View file

@ -128,7 +128,11 @@ def read_config(opts, config_file='config.py'):
bin_paths = { bin_paths = {
'aapt': [ 'aapt': [
os.path.join(config['sdk_path'], 'build-tools', config['build_tools'], 'aapt'), os.path.join(config['sdk_path'], 'build-tools', config['build_tools'], 'aapt'),
] ],
'zipalign': [
os.path.join(config['sdk_path'], 'tools', 'zipalign'),
os.path.join(config['sdk_path'], 'build-tools', config['build_tools'], 'zipalign'),
],
} }
for b, paths in bin_paths.items(): for b, paths in bin_paths.items():

3
fdroidserver/publish.py
View file

@ -160,8 +160,7 @@ def main():
raise BuildException("Failed to sign application") raise BuildException("Failed to sign application")
# Zipalign it... # Zipalign it...
p = FDroidPopen([os.path.join(config['sdk_path'], 'tools', 'zipalign'), p = FDroidPopen([config['zipalign'], '-v', '4', apkfile,
'-v', '4', apkfile,
os.path.join(output_dir, apkfilename)]) os.path.join(output_dir, apkfilename)])
if p.returncode != 0: if p.returncode != 0:
raise BuildException("Failed to align application") raise BuildException("Failed to align application")