diff options
| author | jorgelo@chromium.org <jorgelo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-18 01:26:20 +0000 |
|---|---|---|
| committer | jorgelo@chromium.org <jorgelo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-18 01:26:20 +0000 |
| commit | a33b9f6a54a41c7a2d39b5cba3a2b032e754db00 (patch) | |
| tree | 7100cdf0648c83a73a0d8aaf7f9ca96a290fd7a7 /content/content_browser.gypi | |
| parent | dc5e17fc5a82891d84913ee78d17b6e5465d9976 (diff) | |
| download | chromium_src-a33b9f6a54a41c7a2d39b5cba3a2b032e754db00.zip chromium_src-a33b9f6a54a41c7a2d39b5cba3a2b032e754db00.tar.gz chromium_src-a33b9f6a54a41c7a2d39b5cba3a2b032e754db00.tar.bz2 | |
Set LINUX_SANDBOX_PATH when on Linux or Chrome OS.
LINUX_SANDBOX_PATH was being set when 'toolkit_use_gtk' was on.
With the Aura switch, GTK was no longer used and the sandbox
stopped working.
BUG=chromium-os:26299
TEST=security_RendererSandbox passes again
Change-Id: I2a47256740a99a27d5b1cc1ce6e6ebb265e3841d
Review URL: http://codereview.chromium.org/9414035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122655 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_browser.gypi')
| -rw-r--r-- | content/content_browser.gypi | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/content/content_browser.gypi b/content/content_browser.gypi index c1b81a50..ebcf8ed 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -741,6 +741,12 @@ '../build/linux/system.gyp:x11', '../dbus/dbus.gyp:dbus', ], + }], + ['OS=="linux"', { + 'dependencies': [ + '../build/linux/system.gyp:udev', + ], + # Set LINUX_SANDBOX_PATH for Linux, including Chrome OS 'conditions': [ ['linux_sandbox_path != ""', { 'defines': [ @@ -749,11 +755,6 @@ }], ], }], - ['OS=="linux"', { - 'dependencies': [ - '../build/linux/system.gyp:udev', - ], - }], ['OS=="linux" and toolkit_uses_gtk==0', { 'dependencies': [ '../build/linux/system.gyp:dbus', |