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

Deprecate aapt_path in favour of sdk_path + build_tools

Browse source
This commit is contained in:
Daniel Martí 2013-08-08 13:00:02 +02:00
parent d86a68b858
commit ece2ece071
4 changed files with 4 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
fdroidserver/build.py
View file

@ -483,14 +483,8 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
print "Checking " + src
if not os.path.exists(src):
raise BuildException("Unsigned apk is not at expected location of " + src)
if ('aapt_path' not in globals()):
# (re-)read configuration
execfile('config.py', globals())
if not os.path.exists(aapt_path):
print "Missing aapt - check aapt_path in your config"
sys.exit(1)
p = subprocess.Popen([aapt_path,
p = subprocess.Popen([os.path.join(sdk_path, 'build-tools', build_tools, 'aapt'),
'dump', 'badging', src],
stdout=subprocess.PIPE)
output = p.communicate()[0]