summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/common.gypi2
-rw-r--r--chrome/chrome_browser.gypi9
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', {