Index: build/linux/system.gyp |
diff --git a/build/linux/system.gyp b/build/linux/system.gyp |
index e3457fa21970e6caa4b75dc5ef80ae81edbd8875..9d0c6b68698848410ff498f43736e509d01f3ab1 100644 |
--- a/build/linux/system.gyp |
+++ b/build/linux/system.gyp |
@@ -987,41 +987,14 @@ |
'defines': [ |
'USE_GNOME_KEYRING', |
], |
- 'conditions': [ |
- ['linux_link_gnome_keyring==0', { |
- 'defines': ['DLOPEN_GNOME_KEYRING'], |
- }], |
- ], |
}, |
- 'conditions': [ |
- ['linux_link_gnome_keyring!=0', { |
- 'link_settings': { |
- 'ldflags': [ |
- '<!@(<(pkg-config) --libs-only-L --libs-only-other gnome-keyring-1)', |
- ], |
- 'libraries': [ |
- '<!@(<(pkg-config) --libs-only-l gnome-keyring-1)', |
- ], |
- }, |
- }, { |
- 'conditions': [ |
- ['OS=="linux"', { |
- 'link_settings': { |
- 'libraries': [ |
- '-ldl', |
- ], |
- }, |
- }], |
- ], |
- }], |
- ], |
}], |
], |
}, |
{ |
# The unit tests use a few convenience functions from the GNOME |
- # Keyring library directly. We ignore linux_link_gnome_keyring and |
- # link directly in this version of the target to allow this. |
+ # Keyring library directly. We link directly in this version of |
+ # the target to allow this. |
# *** Do not use this target in the main binary! *** |
'target_name': 'gnome_keyring_direct', |
'type': 'none', |
@@ -1034,11 +1007,6 @@ |
'defines': [ |
'USE_GNOME_KEYRING', |
], |
- 'conditions': [ |
- ['linux_link_gnome_keyring==0', { |
- 'defines': ['DLOPEN_GNOME_KEYRING'], |
- }], |
- ], |
}, |
'link_settings': { |
'ldflags': [ |