summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-16 01:37:41 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-16 01:37:41 +0000
commit85d2283a1db23b92929745e8af6f2684d2d0ee78 (patch)
tree5cbcdc41be6dd2a53fde58627ec2ec0c691900d9 /chrome
parentc344ec1ecf38c765acbd0caadda9f192310089a7 (diff)
downloadchromium_src-85d2283a1db23b92929745e8af6f2684d2d0ee78.zip
chromium_src-85d2283a1db23b92929745e8af6f2684d2d0ee78.tar.gz
chromium_src-85d2283a1db23b92929745e8af6f2684d2d0ee78.tar.bz2
Linux: fix build of setuid sandbox.
This was broken by http://src.chromium.org/viewvc/chrome?view=rev&revision=65892 . BUG=none TEST=none Review URL: http://codereview.chromium.org/4980003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66211 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/chrome_browser.gypi5
-rw-r--r--chrome/chrome_exe.gypi5
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index f0a5a6d..e282142 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3503,6 +3503,11 @@
'third_party/mozilla_security_manager/nsUsageArrayHelper.h',
],
}],
+ ['linux_sandbox_path != ""', {
+ 'defines': [
+ 'LINUX_SANDBOX_PATH="<(linux_sandbox_path)"',
+ ],
+ }],
],
}, { # OS != "linux"
'sources!': [
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 198a3de..b0ddfd8 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -397,11 +397,6 @@
'../sandbox/sandbox.gyp:sandbox',
],
}],
- ['linux_sandbox_path != ""', {
- 'defines': [
- 'LINUX_SANDBOX_PATH="<(linux_sandbox_path)"',
- ],
- }],
],
}],
['OS != "mac"', {