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

Maintiain android update project behaviour in new platform tools

Browse source
This commit is contained in:
Ciaran Gultnieks 2012-01-04 22:58:37 +00:00
parent 14bc39010b
commit 775e1e245a
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
common.py
View file

@ -427,6 +427,13 @@ def prepare_source(vcs, app, build, build_dir, sdk_path, ndk_path, javacc_path,
if build.has_key('target'): if build.has_key('target'):
parms.append('-t') parms.append('-t')
parms.append(build['target']) parms.append(build['target'])
# Newer versions of the platform tools don't replace the build.xml
# file as they always did previously, they spew out a nanny-like
# warning and tell you to do it manually. The following emulates
# the original behaviour...
buildxml = os.path.join(root_dir, 'build.xml')
if os.path.exists(buildxml):
os.remove(buildxml)
if subprocess.call(parms, cwd=root_dir) != 0: if subprocess.call(parms, cwd=root_dir) != 0:
raise BuildException("Failed to update project") raise BuildException("Failed to update project")