Linux: make compile-time dependency on gnome-keyring optional.

build/common.gypi

 # Copyright (c) 2010 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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   'variables': {
     # .gyp files or targets should set chromium_code to 1 if they build
@@ skipping 55 matching lines @@
 
         # To do a shared build on linux we need to be able to choose between
         # type static_library and shared_library. We default to doing a static
         # build but you can override this with "gyp -Dlibrary=shared_library"
         # or you can add the following line (without the #) to
         # ~/.gyp/include.gypi {'variables': {'library': 'shared_library'}}
         # to compile as shared by default
         '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)',
 
       # Default architecture we're building for is the architecture we're
       # building on.
       'target_arch%': '<(host_arch)',
 
       # Copy conditionally-set chromeos and touchui variables out one scope.
       'chromeos%': '<(chromeos)',
@@ skipping 40 matching lines @@
       'component%': '<(library)',
     },
 
     # Define branding and buildtype on the basis of their settings within the
     # variables sub-dict above, unless overridden.
     'branding%': '<(branding)',
     'buildtype%': '<(buildtype)',
     '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)',
     'fastbuild%': '<(fastbuild)',
     'linux_fpic%': '<(linux_fpic)',
     'python_ver%': '<(python_ver)',
     'armv7%': '<(armv7)',
     'arm_neon%': '<(arm_neon)',
     'sysroot%': '<(sysroot)',
     'disable_sse2%': '<(disable_sse2)',
@@ skipping 1286 matching lines @@
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: