native_client_sdk/src/resources/Makefile.example.template - Issue 412083002: [NaCl SDK] Allow ppapi_simple executables to run in both sel_ldr and in chrome.

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 412083002: [NaCl SDK] Allow ppapi_simple executables to run in both sel_ldr and in chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 5 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

« native_client_sdk/src/libraries/ppapi_simple/ps.h ('K') | « native_client_sdk/src/libraries/ppapi_simple/ps_main.cc ('k') | native_client_sdk/src/tests/nacl_io_socket_test/main.cc » ('j') | no next file with comments »
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 ca1605fd2e39915836f4489ee16326f3dfd33f05..3d6ceb02036addf00b757ebb875a51ebd3995474 100644

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

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

@@ -47,18 +47,8 @@ CHROME_ARGS += --allow-nacl-socket-api=localhost

[[]]

TARGET = {{targets[0]['NAME']}}

-[[if sel_ldr and targets[0].get('SEL_LDR_LIBS'):]]

-ifdef SEL_LDR

-[[ ExpandDict('DEPS', targets[0].get('SEL_LDR_DEPS', []))]]

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

-else

-[[ ExpandDict('DEPS', targets[0].get('DEPS', []))]]

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

-endif

-[[else:]]

-[[ ExpandDict('DEPS', targets[0].get('DEPS', []))]]

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

-[[]]

+[[ExpandDict('DEPS', targets[0].get('DEPS', []))]]

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

[[for target in targets:]]

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