ppapi/nacl_irt/manifest_service.cc - Issue 652393003: Non-SFI mode: Build ppapi libraries for nacl_helper_nonsfi.

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: ppapi/nacl_irt/manifest_service.cc

Issue 652393003: Non-SFI mode: Build ppapi libraries for nacl_helper_nonsfi. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

Index: ppapi/nacl_irt/manifest_service.cc

diff --git a/ppapi/nacl_irt/manifest_service.cc b/ppapi/nacl_irt/manifest_service.cc

index 9bf33dee7b09ff977a78bde6e1e1511e8d9f1ba8..8bd6dc602a1a70ed771d06359300780fb844ee26 100644

--- a/ppapi/nacl_irt/manifest_service.cc

+++ b/ppapi/nacl_irt/manifest_service.cc

@@ -104,7 +104,7 @@ bool ManifestService::OpenResource(const char* file, int* fd) {

return false;

}

-#if defined(OS_NACL)

+#if defined(OS_NACL) && !defined(__native_client_nonsfi__)

Mark Seaborn 2014/10/27 18:59:07 Can use OS_NACL_SFI once your other change is comm

hidehiko 2014/10/28 20:14:00 Done.

// File tokens are used internally by NaClIPCAdapter and should have

// been cleared from the message when it is received here.

// Note that, on Non-SFI NaCl, the IPC channel is directly connected to the

« no previous file with comments | « components/nacl_nonsfi.gyp ('k') | ppapi/nacl_irt/plugin_main.cc » ('j') | ppapi/nacl_irt/plugin_main.cc » ('J')