From d73f2b9368ff59747782659dbb3e4040955d92a8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Thu, 3 Jul 2014 00:31:10 +0200 Subject: [PATCH] Also find zipalign at the start --- fdroidserver/common.py | 6 +++++- fdroidserver/publish.py | 3 +-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 949fdd1d..9b36f2c6 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -128,7 +128,11 @@ def read_config(opts, config_file='config.py'): bin_paths = { '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(): diff --git a/fdroidserver/publish.py b/fdroidserver/publish.py index bff1a2e3..fb696205 100644 --- a/fdroidserver/publish.py +++ b/fdroidserver/publish.py @@ -160,8 +160,7 @@ def main(): raise BuildException("Failed to sign application") # Zipalign it... - p = FDroidPopen([os.path.join(config['sdk_path'], 'tools', 'zipalign'), - '-v', '4', apkfile, + p = FDroidPopen([config['zipalign'], '-v', '4', apkfile, os.path.join(output_dir, apkfilename)]) if p.returncode != 0: raise BuildException("Failed to align application") -- 2.30.2