diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-20 21:09:33 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-20 21:09:33 +0000 |
| commit | c6f1530f0b07ab7b50b98977ab4c179275eb5831 (patch) | |
| tree | 6838ba92b3d30d0f063f5e39448b07d724f0482e /build/linux | |
| parent | ab243a325f1a5e309efc05d87516979ef15347f3 (diff) | |
| download | chromium_src-c6f1530f0b07ab7b50b98977ab4c179275eb5831.zip chromium_src-c6f1530f0b07ab7b50b98977ab4c179275eb5831.tar.gz chromium_src-c6f1530f0b07ab7b50b98977ab4c179275eb5831.tar.bz2 | |
Revert "Linux: add library loader for GNOME keyring."
Causes crashes on Ubuntu Lucid.
TBR=brettw
BUG=166913, 162733
Review URL: https://codereview.chromium.org/11647041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174238 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/linux')
| -rw-r--r-- | build/linux/system.gyp | 67 |
1 files changed, 18 insertions, 49 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp index 7a172ff..fa9aee6 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -620,15 +620,9 @@ }, { 'target_name': 'gnome_keyring', - 'type': 'static_library', + 'type': 'none', 'conditions': [ ['use_gnome_keyring==1', { - 'dependencies': [ - '../../base/base.gyp:base', - ], - 'cflags': [ - '<!@(<(pkg-config) --cflags gnome-keyring-1)', - ], 'direct_dependent_settings': { 'cflags': [ '<!@(<(pkg-config) --cflags gnome-keyring-1)', @@ -636,58 +630,33 @@ 'defines': [ 'USE_GNOME_KEYRING', ], - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)', + 'conditions': [ + ['linux_link_gnome_keyring==0', { + 'defines': ['DLOPEN_GNOME_KEYRING'], + }], ], }, - 'link_settings': { - 'conditions': [ - ['linux_link_gnome_keyring==1', { + '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)', ], - }, { # linux_link_gnome_keyring==0 - 'libraries': [ - '-ldl', - ], - }], - ], - }, - 'hard_dependency': 1, - 'actions': [ - { - 'variables': { - 'output_h': '<(SHARED_INTERMEDIATE_DIR)/library_loaders/libgnome-keyring.h', - 'output_cc': '<(INTERMEDIATE_DIR)/libgnome_keyring_loader.cc', - 'generator': '../../tools/generate_library_loader/generate_library_loader.py', }, - 'action_name': 'generate_libgnome_keyring_loader', - 'inputs': [ - '<(generator)', - ], - 'outputs': [ - '<(output_h)', - '<(output_cc)', - ], - 'action': ['python', - '<(generator)', - '--name', 'LibGnomeKeyringLoader', - '--output-h', '<(output_h)', - '--output-cc', '<(output_cc)', - '--header', '<gnome-keyring.h>', - '--link-directly=<(linux_link_gnome_keyring)', - 'gnome_keyring_is_available', - 'gnome_keyring_store_password', - 'gnome_keyring_delete_password', - 'gnome_keyring_find_itemsv', - 'gnome_keyring_result_to_message', + }, { + 'conditions': [ + ['OS=="linux"', { + 'link_settings': { + 'libraries': [ + '-ldl', + ], + }, + }], ], - 'message': 'Generating libgnome-keyring library loader.', - 'process_outputs_as_sources': 1, - }, + }], ], }], ], |