Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4329)

Unified Diff: chrome/nacl/nacl_fork_delegate_linux.cc

Issue 7992013: Merge 100031 - Modify the build recipe for nacl_helper_bootstrap to invoke the linker explicitly ... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/874/src/
Patch Set: 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/nacl.gypi ('k') | tools/ld_bfd/ld » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/nacl/nacl_fork_delegate_linux.cc
===================================================================
--- chrome/nacl/nacl_fork_delegate_linux.cc (revision 102300)
+++ chrome/nacl/nacl_fork_delegate_linux.cc (working copy)
@@ -46,7 +46,6 @@
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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698