From 6e515ed34e2da6a08b045535deb281af3b4adbcb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Thu, 3 Jul 2014 00:34:16 +0200 Subject: [PATCH] Find the 'android' executable in the same manner --- fdroidserver/common.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 9b36f2c6..172e9857 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -133,6 +133,9 @@ def read_config(opts, config_file='config.py'): os.path.join(config['sdk_path'], 'tools', 'zipalign'), os.path.join(config['sdk_path'], 'build-tools', config['build_tools'], 'zipalign'), ], + 'android': [ + os.path.join(config['sdk_path'], 'tools', 'android'), + ], } for b, paths in bin_paths.items(): @@ -1323,9 +1326,8 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver= # Generate (or update) the ant build file, build.xml... if build['update'] and build['update'] != ['no'] and build['type'] == 'ant': - parms = [os.path.join(config['sdk_path'], 'tools', 'android'), 'update'] - lparms = parms + ['lib-project'] - parms = parms + ['project'] + parms = [config['android'], 'update', 'lib-project'] + lparms = [config['android'], 'update', 'project'] if build['target']: parms += ['-t', build['target']] -- 2.30.2