| Index: build/linux/system.gyp
|
| diff --git a/build/linux/system.gyp b/build/linux/system.gyp
|
| index 23f2689c6b7f427d2c09282606f8cb1f234c8fdc..041afd54072d664bd83734d37e0832142c721c1e 100644
|
| --- a/build/linux/system.gyp
|
| +++ b/build/linux/system.gyp
|
| @@ -242,9 +242,15 @@
|
| },
|
| {
|
| 'target_name': 'gio',
|
| - 'type': 'none',
|
| + 'type': 'static_library',
|
| 'conditions': [
|
| ['use_gio==1 and _toolset=="target"', {
|
| + 'dependencies': [
|
| + '../../base/base.gyp:base',
|
| + ],
|
| + 'cflags': [
|
| + '<!@(<(pkg-config) --cflags gio-2.0)',
|
| + ],
|
| 'direct_dependent_settings': {
|
| 'cflags': [
|
| '<!@(<(pkg-config) --cflags gio-2.0)',
|
| @@ -252,10 +258,8 @@
|
| 'defines': [
|
| 'USE_GIO',
|
| ],
|
| - 'conditions': [
|
| - ['linux_link_gsettings==0', {
|
| - 'defines': ['DLOPEN_GSETTINGS'],
|
| - }],
|
| + 'include_dirs': [
|
| + '<(SHARED_INTERMEDIATE_DIR)',
|
| ],
|
| },
|
| 'link_settings': {
|
| @@ -273,6 +277,44 @@
|
| }],
|
| ],
|
| },
|
| + 'hard_dependency': 1,
|
| + 'actions': [
|
| + {
|
| + 'variables': {
|
| + 'output_h': '<(SHARED_INTERMEDIATE_DIR)/library_loaders/libgio.h',
|
| + 'output_cc': '<(INTERMEDIATE_DIR)/libgio_loader.cc',
|
| + 'generator': '../../tools/generate_library_loader/generate_library_loader.py',
|
| + },
|
| + 'action_name': 'generate_libgio_loader',
|
| + 'inputs': [
|
| + '<(generator)',
|
| + ],
|
| + 'outputs': [
|
| + '<(output_h)',
|
| + '<(output_cc)',
|
| + ],
|
| + 'action': ['python',
|
| + '<(generator)',
|
| + '--name', 'LibGioLoader',
|
| + '--output-h', '<(output_h)',
|
| + '--output-cc', '<(output_cc)',
|
| + '--header', '<gio/gio.h>',
|
| + # TODO(phajdan.jr): This will no longer be needed
|
| + # after switch to Precise, http://crbug.com/158577 .
|
| + '--bundled-header', '"build/linux/gsettings.h"',
|
| + '--link-directly=<(linux_link_gsettings)',
|
| + 'g_settings_new',
|
| + 'g_settings_get_child',
|
| + 'g_settings_get_string',
|
| + 'g_settings_get_boolean',
|
| + 'g_settings_get_int',
|
| + 'g_settings_get_strv',
|
| + 'g_settings_list_schemas',
|
| + ],
|
| + 'message': 'Generating libgio library loader.',
|
| + 'process_outputs_as_sources': 1,
|
| + },
|
| + ],
|
| }],
|
| ],
|
| },
|
| @@ -282,8 +324,8 @@
|
| 'cflags': [
|
| '<!@(<(pkg-config) --cflags libpci)',
|
| ],
|
| - 'include_dirs': [
|
| - '../..',
|
| + 'dependencies': [
|
| + '../../base/base.gyp:base',
|
| ],
|
| 'direct_dependent_settings': {
|
| 'include_dirs': [
|
|
|