summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_exe.gypi
diff options
context:
space:
mode:
authorgregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-24 23:10:37 +0000
committergregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-24 23:10:37 +0000
commitd77ada46dceb41aaea3f80a80a0da1738c6ba4bf (patch)
tree7b6646832e313cd7bf9cc2da4de1be84338165b9 /chrome/chrome_exe.gypi
parent4c33301e993025e82d6d7379111acade0b62afcb (diff)
downloadchromium_src-d77ada46dceb41aaea3f80a80a0da1738c6ba4bf.zip
chromium_src-d77ada46dceb41aaea3f80a80a0da1738c6ba4bf.tar.gz
chromium_src-d77ada46dceb41aaea3f80a80a0da1738c6ba4bf.tar.bz2
Integrate Chrome sandbox changes with NaCl (add Win64 support)
Two significant changes: - Explicitly allow processes to act as servers for named pipes for pipes with chrome.nacl prefix. This worked implicitly on Win32 but doesn't on Win64. - NaCl broker process does not run in the sandbox (by design) Review URL: http://codereview.chromium.org/1098009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42552 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_exe.gypi')
-rw-r--r--chrome/chrome_exe.gypi5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index cd247ce..5181084 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -1,4 +1,4 @@
-# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# Copyright (c) 2009-2010 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -503,8 +503,7 @@
'../breakpad/breakpad.gyp:breakpad_sender_win64',
'../base/base.gyp:base_nacl_win64',
'../chrome_frame/chrome_frame.gyp:npchrome_frame',
- # TODO(gregoryd): build sandbox for 64 bit
- # '../sandbox/sandbox.gyp:sandbox',
+ '../sandbox/sandbox.gyp:sandbox_win64',
],
'defines': [
'<@(nacl_win64_defines)',