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

Find the 'android' executable in the same manner

Browse source
This commit is contained in:
Daniel Martí 2014-07-03 00:34:16 +02:00
parent d73f2b9368
commit 6e515ed34e
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
fdroidserver/common.py
View file

@ -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'], 'tools', 'zipalign'),
os.path.join(config['sdk_path'], 'build-tools', config['build_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(): 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... # Generate (or update) the ant build file, build.xml...
if build['update'] and build['update'] != ['no'] and build['type'] == 'ant': if build['update'] and build['update'] != ['no'] and build['type'] == 'ant':
parms = [os.path.join(config['sdk_path'], 'tools', 'android'), 'update'] parms = [config['android'], 'update', 'lib-project']
lparms = parms + ['lib-project'] lparms = [config['android'], 'update', 'project']
parms = parms + ['project']
if build['target']: if build['target']:
parms += ['-t', build['target']] parms += ['-t', build['target']]