mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 23:10:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Speed up ndk-builds by using all cores

Browse source
This commit is contained in:
Daniel Martí 2014-02-23 23:33:19 +01:00
parent a4ab105234
commit e13b483d99
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
fdroidserver/build.py
View file

@ -30,6 +30,7 @@ import json
from ConfigParser import ConfigParser
from optparse import OptionParser, OptionError
import logging
import multiprocessing
import common, metadata
from common import BuildException, VCSException, FDroidPopen, SilentPopen
@ -471,7 +472,9 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
jni_components = thisbuild.get('buildjni')
if jni_components == ['yes']:
jni_components = ['']
jobs = multiprocessing.cpu_count()
ndkbuild = os.path.join(config['ndk_path'], "ndk-build")
cmd = [ndkbuild, "-j"+str(jobs)]
for d in jni_components:
logging.info("Building native code in '%s'" % d)
manifest = root_dir + '/' + d + '/AndroidManifest.xml'
@ -485,7 +488,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
open(manifest, 'w').write(manifest_text)
# In case the AM.xml read was big, free the memory
del manifest_text
p = FDroidPopen([ndkbuild], cwd=os.path.join(root_dir,d))
p = FDroidPopen(cmd, cwd=os.path.join(root_dir,d))
if p.returncode != 0:
raise BuildException("NDK build failed for %s:%s" % (app['id'], thisbuild['version']), p.stdout)