summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-15 22:00:22 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-15 22:00:22 +0000
commit556975ce5c0d0363423cac3e1d81718f5b2a426b (patch)
treefdd5d7b6b161c1656a7c197fc6a168bb702fb85d /build
parentf42f05b17630c3c1d5e579e6bac64cb544a2fcd4 (diff)
downloadchromium_src-556975ce5c0d0363423cac3e1d81718f5b2a426b.zip
chromium_src-556975ce5c0d0363423cac3e1d81718f5b2a426b.tar.gz
chromium_src-556975ce5c0d0363423cac3e1d81718f5b2a426b.tar.bz2
Linux: fix build with gnome-keyring on Aura.
This is upstreaming a Gentoo Linux patch. BUG=none R=erg@chromium.org Review URL: https://codereview.chromium.org/62173003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235446 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 77e375d..6f40a2c 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -545,7 +545,7 @@
# on gnome-keyring. If that dependency is disabled, no gnome-keyring
# support will be available. This option is useful
# for Linux distributions and for Aura.
- ['chromeos==1 or use_aura==1', {
+ ['OS!="linux" or chromeos==1 or use_aura==1', {
'use_gnome_keyring%': 0,
}, {
'use_gnome_keyring%': 1,