diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-15 22:00:22 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-15 22:00:22 +0000 |
| commit | 556975ce5c0d0363423cac3e1d81718f5b2a426b (patch) | |
| tree | fdd5d7b6b161c1656a7c197fc6a168bb702fb85d | |
| parent | f42f05b17630c3c1d5e579e6bac64cb544a2fcd4 (diff) | |
| download | chromium_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
| -rw-r--r-- | build/common.gypi | 2 | ||||
| -rw-r--r-- | chrome/chrome_browser.gypi | 9 |
2 files changed, 5 insertions, 6 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, diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 02fd893..ab52a1b 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -3080,6 +3080,10 @@ 'browser/password_manager/native_backend_gnome_x.cc', 'browser/password_manager/native_backend_gnome_x.h', ], + }, { + 'dependencies': [ + '../build/linux/system.gyp:gnome_keyring', + ], }], ['use_aura==1', { 'sources/': [ @@ -3170,11 +3174,6 @@ ], }, }], - ['use_gnome_keyring==1', { - 'dependencies': [ - '../build/linux/system.gyp:gnome_keyring', - ], - }], ], }], ['input_speech==0', { |