diff options
| author | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-05 05:18:26 +0000 |
|---|---|---|
| committer | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-05 05:18:26 +0000 |
| commit | b5281450170938c08da6b64ced2438db297f2db6 (patch) | |
| tree | b517b7898bbfb379665d4d1b96b48047bf3d3957 /chrome/nacl | |
| parent | 7a70947e686305901b234f1a65786c80ceca6395 (diff) | |
| download | chromium_src-b5281450170938c08da6b64ced2438db297f2db6.zip chromium_src-b5281450170938c08da6b64ced2438db297f2db6.tar.gz chromium_src-b5281450170938c08da6b64ced2438db297f2db6.tar.bz2 | |
Fix nacl_helper argv bug, re-enable nacl_helper, build on linux except ARM. Previously reviewed as http://codereview.chromium.org/7833017; this time ARM build is disabled.
TBR=mcgrathr,mseaborn,evanm
BUG=92964,nativeclient:480,95196
TEST=nacl_integration on linux
Review URL: http://codereview.chromium.org/7800026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99622 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl')
| -rw-r--r-- | chrome/nacl/nacl_fork_delegate_linux.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/chrome/nacl/nacl_fork_delegate_linux.cc b/chrome/nacl/nacl_fork_delegate_linux.cc index 6623846..828cb6e 100644 --- a/chrome/nacl/nacl_fork_delegate_linux.cc +++ b/chrome/nacl/nacl_fork_delegate_linux.cc @@ -46,22 +46,19 @@ 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; // Disable nacl_helper while fixing some issues. - FilePath helper_exe; FilePath helper_bootstrap_exe; if (PathService::Get(chrome::FILE_NACL_HELPER, &helper_exe) && PathService::Get(chrome::FILE_NACL_HELPER_BOOTSTRAP, &helper_bootstrap_exe) && !RunningOnValgrind()) { - CommandLine::StringVector argv = CommandLine::ForCurrentProcess()->argv(); - argv[0] = helper_bootstrap_exe.value(); - argv[1] = helper_exe.value(); - argv[2] = kNaClHelperAtZero; + CommandLine cmd_line(helper_bootstrap_exe); + cmd_line.AppendArgPath(helper_exe); + cmd_line.AppendArgNative(kNaClHelperAtZero); base::LaunchOptions options; options.fds_to_remap = &fds_to_map; options.clone_flags = CLONE_FS | SIGCHLD; - ready_ = base::LaunchProcess(argv, options, NULL); + ready_ = base::LaunchProcess(cmd_line.argv(), options, NULL); // parent and error cases are handled below } if (HANDLE_EINTR(close(fds[1])) != 0) |