summaryrefslogtreecommitdiffstats
path: root/sandbox
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-16 18:39:53 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-16 18:39:53 +0000
commit46ce5b568acd801330e52a4e04534d9689990835 (patch)
tree86944486c8faf85322981d343013f2de8ecfbb91 /sandbox
parentac201f961a6c0151dc596829584339c199527ba5 (diff)
downloadchromium_src-46ce5b568acd801330e52a4e04534d9689990835.zip
chromium_src-46ce5b568acd801330e52a4e04534d9689990835.tar.gz
chromium_src-46ce5b568acd801330e52a4e04534d9689990835.tar.bz2
Revert 49982 - patch
TBR=thakis@chromium.org Review URL: http://codereview.chromium.org/2825006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50002 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox')
-rw-r--r--sandbox/sandbox.gyp4
1 files changed, 2 insertions, 2 deletions
diff --git a/sandbox/sandbox.gyp b/sandbox/sandbox.gyp
index ab89665..706cba2 100644
--- a/sandbox/sandbox.gyp
+++ b/sandbox/sandbox.gyp
@@ -135,7 +135,7 @@
},
],
}],
- [ 'OS=="linux" and selinux==0 and clang==0', {
+ [ 'OS=="linux" and selinux==0', {
'targets': [
{
'target_name': 'chrome_sandbox',
@@ -168,7 +168,7 @@
},
],
}],
- [ 'OS=="linux" and (selinux==1 or clang==1)', {
+ [ 'OS=="linux" and selinux==1', {
# GYP requires that each file have at least one target defined.
'targets': [
{