diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-16 00:22:21 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-16 00:22:21 +0000 |
| commit | 63692215e10b693db53a395a9fdefd77cf3a6fc6 (patch) | |
| tree | 5def9ef1dd75c3924f351c760ad9fa8e98065770 /build | |
| parent | 86f56f6d510c533fe570fb6153b6c1f7b4b365a3 (diff) | |
| download | chromium_src-63692215e10b693db53a395a9fdefd77cf3a6fc6.zip chromium_src-63692215e10b693db53a395a9fdefd77cf3a6fc6.tar.gz chromium_src-63692215e10b693db53a395a9fdefd77cf3a6fc6.tar.bz2 | |
Linux: make compile-time dependency on gnome-keyring optional.
This is upstreaming a Gentoo Linux patch.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3380004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59587 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 17 | ||||
| -rw-r--r-- | build/linux/system.gyp | 5 |
2 files changed, 18 insertions, 4 deletions
diff --git a/build/common.gypi b/build/common.gypi index 2730feb..0f721ed 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -73,16 +73,26 @@ 'library%': 'static_library', }, - # Set default value of toolkit_views on for Windows, Chrome OS - # and the touch UI. - # We set it at this level of nesting so the value is available for + # We set those at this level of nesting so the values are available for # other conditionals below. 'conditions': [ + # Set default value of toolkit_views on for Windows, Chrome OS + # and the touch UI. ['OS=="win" or chromeos==1 or touchui==1', { 'toolkit_views%': 1, }, { 'toolkit_views%': 0, }], + + # A flag to enable or disable our compile-time dependency + # on gnome-keyring. If that dependency is disabled, no gnome-keyring + # support will be available. This option is useful + # for Linux distributions. + ['chromeos==1', { + 'use_gnome_keyring%': 0, + }, { + 'use_gnome_keyring%': 1, + }], ], 'host_arch%': '<(host_arch)', @@ -143,6 +153,7 @@ 'target_arch%': '<(target_arch)', 'host_arch%': '<(host_arch)', 'toolkit_views%': '<(toolkit_views)', + 'use_gnome_keyring%': '<(use_gnome_keyring)', 'chromeos%': '<(chromeos)', 'touchui%': '<(touchui)', 'inside_chromium_build%': '<(inside_chromium_build)', diff --git a/build/linux/system.gyp b/build/linux/system.gyp index f746ebf..816c584 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', { 'direct_dependent_settings': { 'cflags': [ '<!@(<(pkg-config) --cflags gnome-keyring-1)', ], + 'defines': [ + 'USE_GNOME_KEYRING', + ], 'conditions': [ ['linux_link_gnome_keyring==0', { 'defines': ['DLOPEN_GNOME_KEYRING'], |