diff options
| author | mdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-16 20:04:35 +0000 |
|---|---|---|
| committer | mdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-16 20:04:35 +0000 |
| commit | abcc9ac80e3ca63efd2ebeb18954f79f56204e88 (patch) | |
| tree | 674cfb63b2d148334a7f7f9905a85882e1e53db9 /build | |
| parent | 1662374a9ad9be976004bc06b66f83282145088e (diff) | |
| download | chromium_src-abcc9ac80e3ca63efd2ebeb18954f79f56204e88.zip chromium_src-abcc9ac80e3ca63efd2ebeb18954f79f56204e88.tar.gz chromium_src-abcc9ac80e3ca63efd2ebeb18954f79f56204e88.tar.bz2 | |
Linux: add gyp rules for gio library and gsettings link mode.
These will be used to add support for proxy settings in gsettings.
Note that no new dependencies are added in the default configuration.
BUG=80453
Review URL: http://codereview.chromium.org/7030007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85524 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 7 | ||||
| -rw-r--r-- | build/linux/system.gyp | 35 |
2 files changed, 41 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index eb4d664..227ddec 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -361,6 +361,8 @@ # Set to 1 to link against libgnome-keyring instead of using dlopen(). 'linux_link_gnome_keyring%': 0, + # Set to 1 to link against gsettings APIs instead of using dlopen(). + 'linux_link_gsettings%': 0, # Used to disable Native Client at compile time, for platforms where it # isn't supported @@ -519,11 +521,14 @@ 'libjpeg_gyp_path': '../third_party/libjpeg/libjpeg.gyp', }], # use_libjpeg_turbo==1 - # Use GConf, the GNOME configuration system. + # Options controlling the use of GConf (the classic GNOME configuration + # system) and GIO, which contains GSettings (the new GNOME config system). ['chromeos==1', { 'use_gconf%': 0, + 'use_gio%': 0, }, { 'use_gconf%': 1, + 'use_gio%': 1, }], # Set up -D and -E flags passed into grit. diff --git a/build/linux/system.gyp b/build/linux/system.gyp index 528cda6..587f31d 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -212,6 +212,41 @@ }]] }, { + 'target_name': 'gio', + 'type': 'settings', + 'conditions': [ + ['use_gio==1 and _toolset=="target"', { + 'direct_dependent_settings': { + 'cflags': [ + '<!@(<(pkg-config) --cflags gio-2.0)', + ], + 'defines': [ + 'USE_GIO', + ], + 'conditions': [ + ['linux_link_gsettings==0', { + 'defines': ['DLOPEN_GSETTINGS'], + }], + ], + }, + 'link_settings': { + 'ldflags': [ + '<!@(<(pkg-config) --libs-only-L --libs-only-other gio-2.0)', + ], + 'libraries': [ + '<!@(<(pkg-config) --libs-only-l gio-2.0)', + ], + 'conditions': [ + ['linux_link_gsettings==0', { + 'libraries': [ + '-ldl', + ], + }], + ], + }, + }]] + }, + { 'target_name': 'x11', 'type': 'settings', 'conditions': [ |