linux_aura: Default use_gnome_keyring% to on when use_aura=1.
BUG=342106
Review URL: https://codereview.chromium.org/171583002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251992 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/build/common.gypi b/build/common.gypi
index 1bd4d51..4c85eaf 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -590,7 +590,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.
- ['OS!="linux" or chromeos==1 or use_aura==1', {
+ ['OS!="linux" or chromeos==1', {
'use_gnome_keyring%': 0,
}, {
'use_gnome_keyring%': 1,
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index b83257fb..2ad001c 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -2347,16 +2347,6 @@
'browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc',
],
}],
- ['chromeos==0', {
- 'conditions': [
- ['use_gnome_keyring==1', {
- # We use a few library functions directly, so link directly.
- 'dependencies': [
- '../build/linux/system.gyp:gnome_keyring_direct',
- ],
- }],
- ],
- }],
],
'dependencies': [
'../build/linux/system.gyp:dbus',
@@ -2380,6 +2370,11 @@
'sources!': [
'browser/password_manager/native_backend_gnome_x_unittest.cc',
],
+ }, {
+ # We use a few library functions directly, so link directly.
+ 'dependencies': [
+ '../build/linux/system.gyp:gnome_keyring_direct',
+ ],
}],
['OS=="linux" and use_aura==1', {
'dependencies': [
