Support static/dynamic for bionic

native_client_sdk/src/build_tools/build_projects.py

Index: native_client_sdk/src/build_tools/build_projects.py
diff --git a/native_client_sdk/src/build_tools/build_projects.py b/native_client_sdk/src/build_tools/build_projects.py
index dd8ec1c2cc949d685c8301644a22b5cdd786a853..4e91f39a95aa160ff0d4159f1ee3de528df037ee 100755
--- a/native_client_sdk/src/build_tools/build_projects.py
+++ b/native_client_sdk/src/build_tools/build_projects.py
@@ -94,6 +94,19 @@ def ValidateToolchains(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):
@@ -123,11 +136,12 @@ def UpdateProjects(pepperdir, project_tree, toolchains,
       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()
@@ -156,7 +170,7 @@ def UpdateProjects(pepperdir, project_tree, toolchains,
   branch_name = 'examples'
   generate_make.GenerateMasterMakefile(pepperdir,
                                        os.path.join(pepperdir, branch_name),
-                                       targets)
+                                       targets, [])
 
 
 def BuildProjectsBranch(pepperdir, branch, deps, clean, config, args=None):