native_client_sdk/src/build_tools/generate_make.py - Issue 240493003: Support static/dynamic for bionic

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: native_client_sdk/src/build_tools/generate_make.py

Issue 240493003: Support static/dynamic for bionic (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Enable bionic static/dynamic and nacl_io test Created 6 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: native_client_sdk/src/build_tools/generate_make.py

diff --git a/native_client_sdk/src/build_tools/generate_make.py b/native_client_sdk/src/build_tools/generate_make.py

index 4188e7a0b018534ccc4b07b6e1c3766aa321f803..45eb9336f89f08c442e3ae5eae4ceedeb76d6758 100644

--- a/native_client_sdk/src/build_tools/generate_make.py

+++ b/native_client_sdk/src/build_tools/generate_make.py

@@ -276,7 +276,7 @@ def ProcessProject(pepperdir, srcroot, dstroot, desc, toolchains, configs=None,

return (name, desc['DEST'])

-def GenerateMasterMakefile(pepperdir, out_path, targets):

+def GenerateMasterMakefile(pepperdir, out_path, targets, deps):

"""Generate a Master Makefile that builds all examples.

Args:

@@ -289,6 +289,7 @@ def GenerateMasterMakefile(pepperdir, out_path, targets):

rel_path = os.path.relpath(pepperdir, os.path.dirname(out_path))

template_dict = {

'projects': targets,

+ 'deps' : deps,

'rel_sdk' : rel_path,

}

RunTemplateFileIfChanged(in_path, out_path, template_dict)