native_client_sdk/src/resources/Makefile.example.template - Issue 1559463002: [NaCl SDK] Don't include gtest/gmock in library form

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/resources/Makefile.example.template

Issue 1559463002: [NaCl SDK] Don't include gtest/gmock in library form (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 12 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « native_client_sdk/src/libraries/gtest/library.dsc ('k') | native_client_sdk/src/tests/nacl_io_socket_test/example.dsc » ('j') | native_client_sdk/src/tests/nacl_io_socket_test/socket_test.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: native_client_sdk/src/resources/Makefile.example.template

diff --git a/native_client_sdk/src/resources/Makefile.example.template b/native_client_sdk/src/resources/Makefile.example.template

index aef08ef2997ea9d330d3abaf1128510c15cfa507..750af9daf284fb1170e96346d8f2be6f52c98d80 100644

--- a/native_client_sdk/src/resources/Makefile.example.template

+++ b/native_client_sdk/src/resources/Makefile.example.template

@@ -52,7 +52,8 @@ CHROME_ARGS += --allow-nacl-socket-api=localhost

[[ExpandDict('LIBS', targets[0].get('LIBS', []))]]

[[for target in targets:]]

-[[ source_list = (s for s in sorted(target['SOURCES']) if not s.endswith('.h'))]]

+[[ source_list = sorted(target['SOURCES'] + target.get('EXTRA_SOURCES', []))]]

binji 2016/01/04 19:48:21 looks like you don't need EXTRA_SOURCES if they're

Sam Clegg 2016/01/05 12:29:05 SOURCES are searched for and copied into the tree.

+[[ source_list = (s for s in source_list if not s.endswith('.h'))]]

[[ source_list = ' \\\n '.join(source_list)]]

[[ sources = target['NAME'] + '_SOURCES']]

[[ cflags = target['NAME'] + '_CFLAGS']]