Break gyp cycles on Linux.

chrome/chrome.gyp

 # 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.
 {
   'variables': {
     'chromium_code': 1,
 
     'variables': {
       'version_py_path': 'tools/build/version.py',
       'version_path': 'VERSION',
@@ skipping 19 matching lines @@
       'utility',
       'profile_import',
       'worker',
       'service',
       '../printing/printing.gyp:printing',
       '../webkit/webkit.gyp:inspector_resources',
     ],
     'nacl_win64_dependencies': [
       'common_nacl_win64',
       'common_constants_win64',
-      'installer/installer.gyp:installer_util_nacl_win64',
+      'installer_util_nacl_win64',
     ],
     'allocator_target': '../base/allocator/allocator.gyp:allocator',
     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
     'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
     'chrome_strings_grds': [
       # Localizable resources.
       'app/resources/locale_settings.grd',
       'app/chromium_strings.grd',
       'app/generated_resources.grd',
       'app/google_chrome_strings.grd',
@@ skipping 66 matching lines @@
   'includes': [
     # Place some targets in gypi files to reduce contention on this file.
     # By using an include, we keep everything in a single xcodeproj file.
     # Note on Win64 targets: targets that end with win64 be used
     # on 64-bit Windows only. Targets that end with nacl_win64 should be used
     # by Native Client only.
     'chrome_browser.gypi',
     'chrome_common.gypi',
     'chrome_dll.gypi',
     'chrome_exe.gypi',
+    'chrome_installer.gypi',
+    'chrome_installer_util.gypi',
     'chrome_renderer.gypi',
     'chrome_tests.gypi',
     'common_constants.gypi',
     'nacl.gypi',
   ],
   'targets': [
     {
       # TODO(mark): It would be better if each static library that needed
       # to run grit would list its own .grd files, but unfortunately some
       # of the static libraries currently have circular dependencies among
@@ skipping 81 matching lines @@
       'conditions': [
         ['OS=="win"', {
           # HACK(nsylvain): We want to enforce a fake dependency on
           # intaller_util_string.  install_util depends on both
           # chrome_strings and installer_util_strings, but for some reasons
           # Incredibuild does not enforce it (most likely a bug). By changing
           # the type and making sure we depend on installer_util_strings, it
           # will always get built before installer_util.
           'type': 'dummy_executable',
           'dependencies': ['../build/win/system.gyp:cygwin',
-                           'installer/installer.gyp:installer_util_strings',],
+                           'installer_util_strings',],
         }, {
           'type': 'none',
         }],
       ],
       'variables': {
         'chrome_strings_inputs': [
           '<!@(<(grit_info_cmd) --inputs <(chrome_strings_grds))',
         ],
       },
       'rules': [
@@ skipping 1115 matching lines @@
     },],  # OS=="linux"
     ['OS=="win"',
       { 'targets': [
         {
           # TODO(sgk):  remove this when we change the buildbots to
           # use the generated build\all.sln file to build the world.
           'target_name': 'pull_in_all',
           'type': 'none',
           'dependencies': [
             'installer/mini_installer.gyp:*',
-            'installer/installer.gyp:*',
             '../app/app.gyp:*',
             '../base/base.gyp:*',
             '../chrome_frame/chrome_frame.gyp:*',
             '../gfx/gfx.gyp:*',
             '../ipc/ipc.gyp:*',
             '../media/media.gyp:*',
             '../net/net.gyp:*',
             '../printing/printing.gyp:*',
             '../sdch/sdch.gyp:*',
             '../skia/skia.gyp:*',
@@ skipping 169 matching lines @@
              'test/automation/window_proxy.cc',
              'test/automation/window_proxy.h',
           ],
         },
         {
           'target_name': 'crash_service',
           'type': 'executable',
           'msvs_guid': '89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC',
           'dependencies': [
             'common_constants',
-            'installer/installer.gyp:installer_util',
+            'installer_util',
             '../base/base.gyp:base',
             '../breakpad/breakpad.gyp:breakpad_handler',
             '../breakpad/breakpad.gyp:breakpad_sender',
           ],
           'include_dirs': [
             '..',
           ],
           'sources': [
             'tools/crash_service/crash_service.cc',
             'tools/crash_service/crash_service.h',
@@ skipping 136 matching lines @@
       }],  # targets
     }],  # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: