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

Unified Diff: build/linux/system.gyp

Issue 3380004: Linux: make compile-time dependency on gnome-keyring optional. (Closed)
Patch Set: fixes Created 10 years, 3 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') | chrome/browser/profile_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/linux/system.gyp
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index f746ebfef16690b2f9611bd7c3c6c04fec6daf2b..816c584d78f7e0e8500f7cb012bc5cecbecccfee 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -259,11 +259,14 @@
'target_name': 'gnome-keyring',
'type': 'settings',
'conditions': [
- ['chromeos==0', {
+ ['use_gnome_keyring==1', {
Evan Martin 2010/09/15 21:28:27 Is this still necessary? Won't this target be unu
Paweł Hajdan Jr. 2010/09/15 21:56:03 I was getting errors without this if gnome-keyring
'direct_dependent_settings': {
'cflags': [
'<!@(<(pkg-config) --cflags gnome-keyring-1)',
],
+ 'defines': [
+ 'USE_GNOME_KEYRING',
+ ],
'conditions': [
['linux_link_gnome_keyring==0', {
'defines': ['DLOPEN_GNOME_KEYRING'],
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698