chrome/nacl/nacl_fork_delegate_linux.cc - Issue 7841008: Update chrome/nacl.gypi to fix chromeos build

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: chrome/nacl/nacl_fork_delegate_linux.cc

Issue 7841008: Update chrome/nacl.gypi to fix chromeos build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Eliminate unneeded comment, add a dependency Created 9 years, 3 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: chrome/nacl/nacl_fork_delegate_linux.cc

diff --git a/chrome/nacl/nacl_fork_delegate_linux.cc b/chrome/nacl/nacl_fork_delegate_linux.cc

index 15779756714a4558dc85f1e283eccfa722e830c6..828cb6eb913be02d33decc1f26cfea7d008edab8 100644

--- a/chrome/nacl/nacl_fork_delegate_linux.cc

+++ b/chrome/nacl/nacl_fork_delegate_linux.cc

@@ -46,7 +46,6 @@ void NaClForkDelegate::Init(const bool sandboxed,

fds_to_map.push_back(std::make_pair(fds[1], kNaClZygoteDescriptor));

fds_to_map.push_back(std::make_pair(sandboxdesc, kNaClSandboxDescriptor));

ready_ = false;

- return; // disabling nacl_helper for now

FilePath helper_exe;

FilePath helper_bootstrap_exe;

if (PathService::Get(chrome::FILE_NACL_HELPER, &helper_exe) &&

« no previous file with comments | « chrome/nacl.gypi ('k') | tools/ld_bfd/ld » ('j') | tools/ld_bfd/ld » ('J')