Linux: use generated library loader for gsettings.

build/linux/system.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'conditions': [
       ['sysroot!=""', {
         'pkg-config': './pkg-config-wrapper "<(sysroot)" "<(target_arch)"',
       }, {
@@ skipping 224 matching lines @@
             ],
             'libraries': [
               '<!@(<(pkg-config) --libs-only-l gconf-2.0)',
             ],
           },
         }],
       ],
     },
     {
       '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)',
             ],
             'defines': [
               'USE_GIO',
             ],
-            'conditions': [
-              ['linux_link_gsettings==0', {
-                'defines': ['DLOPEN_GSETTINGS'],
-              }],
+            'include_dirs': [
+              '<(SHARED_INTERMEDIATE_DIR)',
             ],
           },
           '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 and OS=="linux"', {
                 'libraries': [
                   '-ldl',
                 ],
               }],
             ],
           },
+          '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',

[Ryan Sleevi, 2012/11/29 21:51:04]

Seems like you should indent this consistently with the rest of the GYP files
(eg, put python on the next line, like 293-294 / 284-286)

[Paweł Hajdan Jr., 2012/11/29 22:29:00]

This is consistent with libpci action usage below.

[Ryan Sleevi, 2012/11/29 23:02:58]

This is a nit, and please take it as such given that we lack a formal GYP style
guide, but the preponderance of GYP files within Chromium indent nested
sections. You're clearly very close to the 80 character limit, and you're using
11 characters to maintain this indent.

I would suggest it's more readable and more consistent with a newline and a two
space indent (for both).

[Mark Mentovai, 2012/11/30 20:22:27]

Ryan Sleevi wrote:
What Paweł wrote here is permitted, although if things started to need to wrap,
certainly the first thing you’d do to avoid wrapping is to switch to what Ryan
suggests.

+                         '<(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"',

[Ryan Sleevi, 2012/11/29 21:51:04]

Better than bundled, I think it would be more appropriate to call it 'stub'

[Paweł Hajdan Jr., 2012/11/29 22:29:00]

Nope, bundled is a more accurate term. It emphasizes that the header is a part
of our source tree, and _may_ be out of sync with the system library.

Also, the header should contain just declarations, and "stub" may imply
definitions that would forward to something else.

[Ryan Sleevi, 2012/11/29 23:02:58]

I disagree with this naming. I find "bundled" to suggest it contains the full
definitions - but this doesn't, it still depends on the system library.

Further, the concept of 'stub' is something we've already introduced with the
various use_system_foo headers (as forwarding to either a third_party or to the
system header) and has equivalent concepts and functionality in other build
systems.
A "stub header" is understood to provide the functionality of the real header,
in some conditions. I believe it's a better name.

+                         '--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,
+            },
+          ],
         }],
       ],
     },
     {
       'target_name': 'libpci',
       'type': 'static_library',
       'cflags': [
         '<!@(<(pkg-config) --cflags libpci)',
       ],
-      'include_dirs': [
-        '../..',
+      'dependencies': [
+        '../../base/base.gyp:base',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '<(SHARED_INTERMEDIATE_DIR)',
         ],
         'conditions': [
           ['linux_link_libpci==1', {
             'link_settings': {
               'ldflags': [
                 '<!@(<(pkg-config) --libs-only-L --libs-only-other libpci)',
@@ skipping 376 matching lines @@
             ],
             'libraries': [
               '<!@(<(pkg-config) --libs-only-l libudev)',
             ],
           },
         }],
       ],
     },
   ],
 }