Support static/dynamic for bionic

native_client_sdk/src/build_tools/build_projects.py

 #!/usr/bin/env python
 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import multiprocessing
 import optparse
 import os
 import posixpath
 import sys
@@ skipping 76 matching lines @@
     with open(make_exe, 'wb') as f:
       f.write(urllib2.urlopen(make_url).read())
 
 
 def ValidateToolchains(toolchains):
   invalid_toolchains = set(toolchains) - set(VALID_TOOLCHAINS)
   if invalid_toolchains:
     buildbot_common.ErrorExit('Invalid toolchain(s): %s' % (
         ', '.join(invalid_toolchains)))
 
+def GetDeps(projects):
+  out = []
+  for proj in projects:
+    deplist = []
+    for targ in proj.get('TARGETS', []):
+      deplist.extend(targ.get('DEPS', []) + targ.get('LIBS', []))
+    localdeps = []
+    for dep in deplist:
+      localdeps.append(dep + '_ALL_TARGET')
+    if localdeps:
+      out.append('%s_DEPS:=%s' % (proj['NAME'], ' '.join(localdeps)))

[binji, 2014/04/28 21:01:22]

I'd prefer appending a dict or tuple here and doing the string generation in the
template file. It makes it clearer in the template file what is being generated.

e.g.

  out.append({'name': proj['NAME'], 'value': ' '.join(localdeps)})

then in the template:

  [[for dep in deps:]]
    {{dep['name']}}_DEPS := {{dep['value']}}
  [[]]

[noelallen1, 2014/04/28 23:00:33]

Done.

+  return out
+
 
 def UpdateProjects(pepperdir, project_tree, toolchains,
                    clobber=False, configs=None, first_toolchain=False):
   if configs is None:
     configs = ['Debug', 'Release']
   if not os.path.exists(os.path.join(pepperdir, 'tools')):
     buildbot_common.ErrorExit('Examples depend on missing tools.')
   if not os.path.exists(os.path.join(pepperdir, 'toolchain')):
     buildbot_common.ErrorExit('Examples depend on missing toolchains.')
 
   ValidateToolchains(toolchains)
 
   # Create the library output directories
   libdir = os.path.join(pepperdir, 'lib')
   platform = getos.GetPlatform()
   for config in configs:
     for arch in LIB_DICT[platform]:
       dirpath = os.path.join(libdir, '%s_%s_host' % (platform, arch), config)
       if clobber:
         buildbot_common.RemoveDir(dirpath)
       buildbot_common.MakeDir(dirpath)
 
   landing_page = None
   for branch, projects in project_tree.iteritems():
     dirpath = os.path.join(pepperdir, branch)
     if clobber:
       buildbot_common.RemoveDir(dirpath)
     buildbot_common.MakeDir(dirpath)
     targets = [desc['NAME'] for desc in projects]
+    deps = GetDeps(projects)
 
     # Generate master make for this branch of projects
     generate_make.GenerateMasterMakefile(pepperdir,
                                          os.path.join(pepperdir, branch),
-                                         targets)
+                                         targets, deps)
 
     if branch.startswith('examples') and not landing_page:
       landing_page = LandingPage()
 
     # Generate individual projects
     for desc in projects:
       srcroot = os.path.dirname(desc['FILEPATH'])
       generate_make.ProcessProject(pepperdir, srcroot, pepperdir, desc,
                                    toolchains, configs=configs,
                                    first_toolchain=first_toolchain)
 
       if branch.startswith('examples'):
         landing_page.AddDesc(desc)
 
   if landing_page:
     # Generate the landing page text file.
     index_html = os.path.join(pepperdir, 'examples', 'index.html')
     index_template = os.path.join(SDK_RESOURCE_DIR, 'index.html.template')
     with open(index_html, 'w') as fh:
       out = landing_page.GeneratePage(index_template)
       fh.write(out)
 
   # Generate top Make for examples
   targets = ['api', 'demo', 'getting_started', 'tutorial']
   targets = [x for x in targets if 'examples/'+x in project_tree]
   branch_name = 'examples'
   generate_make.GenerateMasterMakefile(pepperdir,
                                        os.path.join(pepperdir, branch_name),
-                                       targets)
+                                       targets, [])
 
 
 def BuildProjectsBranch(pepperdir, branch, deps, clean, config, args=None):
   make_dir = os.path.join(pepperdir, branch)
   print "\nMake: " + make_dir
 
   if getos.GetPlatform() == 'win':
     # We need to modify the environment to build host on Windows.
     make = os.path.join(make_dir, 'make.bat')
   else:
@@ skipping 144 matching lines @@
 
 
 if __name__ == '__main__':
   script_name = os.path.basename(sys.argv[0])
   try:
     sys.exit(main(sys.argv))
   except parse_dsc.ValidationError as e:
     buildbot_common.ErrorExit('%s: %s' % (script_name, e))
   except KeyboardInterrupt:
     buildbot_common.ErrorExit('%s: interrupted' % script_name)