| Index: build/linux/system.gyp
|
| diff --git a/build/linux/system.gyp b/build/linux/system.gyp
|
| index 0126cfe2563aad21934a4fd7e0eccdf22c2158d9..876579a02d7967f03e24f65293498db802dea740 100644
|
| --- a/build/linux/system.gyp
|
| +++ b/build/linux/system.gyp
|
| @@ -258,32 +258,36 @@
|
| {
|
| 'target_name': 'gnome-keyring',
|
| 'type': 'settings',
|
| - 'direct_dependent_settings': {
|
| - 'cflags': [
|
| - '<!@(<(pkg-config) --cflags gnome-keyring-1)',
|
| - ],
|
| - '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)',
|
| + ['chromeos==0', {
|
| + 'direct_dependent_settings': {
|
| + 'cflags': [
|
| + '<!@(<(pkg-config) --cflags gnome-keyring-1)',
|
| ],
|
| - 'libraries': [
|
| - '<!@(<(pkg-config) --libs-only-l gnome-keyring-1)',
|
| - ],
|
| - },
|
| - }, {
|
| - 'link_settings': {
|
| - 'libraries': [
|
| - '-ldl',
|
| + '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)',
|
| + ],
|
| + },
|
| + }, {
|
| + 'link_settings': {
|
| + 'libraries': [
|
| + '-ldl',
|
| + ],
|
| + },
|
| + }],
|
| + ],
|
| }],
|
| ],
|
| },
|
|
|