Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(919)

Unified Diff: chrome/chrome_tests_unit.gypi

Issue 171583002: linux_aura: Default use_gnome_keyring% to on when use_aura=1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Link directly with gnome keyring in the unit tests. Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests_unit.gypi
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 0f247d91857ba747c09027bce0db8f68abe97451..43a6e990c77c4b754277ea65a860a982b0fc3214 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -2346,16 +2346,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',
@@ -2379,6 +2369,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': [
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698