Break gyp cycles on Linux.

chrome_frame/chrome_frame.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,
     'xul_sdk_dir': '../third_party/xulrunner-sdk/<(OS)',
 
     'variables': {
@@ skipping 163 matching lines @@
             ],
           },
           'msvs_settings': {
             'VCLinkerTool': {
               'DelayLoadDLLs': ['xpcom.dll', 'nspr4.dll', 'shdocvw.dll'],
             },
           },
           'dependencies': [
             # TODO(slightlyoff): Get automation targets working on OS X
             '../chrome/chrome.gyp:automation',
-            '../chrome/installer/installer.gyp:installer_util',
+            '../chrome/chrome.gyp:installer_util',
             '../google_update/google_update.gyp:google_update',
           ],
           'configurations': {
             'Debug_Base': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
                 },
               },
             },
@@ skipping 83 matching lines @@
       ],
       'conditions': [
         ['OS=="win"', {
           'msvs_settings': {
             'VCLinkerTool': {
               'DelayLoadDLLs': ['xpcom.dll', 'nspr4.dll'],
             },
           },
           'dependencies': [
             '../chrome/chrome.gyp:automation',
-            '../chrome/installer/installer.gyp:installer_util',
+            '../chrome/chrome.gyp:installer_util',
             '../google_update/google_update.gyp:google_update',
           ]
         }],
       ],
     },
     {
       'target_name': 'chrome_frame_perftests',
       'msvs_guid': '3767888B-76ED-4D2A-B1F5-263CC56A12AA',
       'type': 'executable',
       'dependencies': [
@@ skipping 32 matching lines @@
       ],
       'include_dirs': [
         '<@(xul_include_directories)',
         '<(DEPTH)/third_party/wtl/include',
         # To allow including "chrome_tab.h"
         '<(INTERMEDIATE_DIR)',
       ],
       'conditions': [
         ['OS=="win"', {
           'dependencies': [
+            '../breakpad/breakpad.gyp:breakpad_handler',
             '../chrome/chrome.gyp:automation',
-            '../breakpad/breakpad.gyp:breakpad_handler',
-            '../chrome/installer/installer.gyp:installer_util',
+            '../chrome/chrome.gyp:installer_util',
             '../google_update/google_update.gyp:google_update',
-            '../chrome/installer/installer.gyp:installer_util',
           ],
           'sources': [
             '../base/test/test_file_util_win.cc',
           ]
         }],
       ],
     },
 
     {
       'target_name': 'chrome_frame_net_tests',
@@ skipping 45 matching lines @@
         ['OS=="win"', {
           'msvs_settings': {
             'VCLinkerTool': {
               'DelayLoadDLLs': ['prntvpt.dll'],
             },
           },
           'dependencies': [
             '../breakpad/breakpad.gyp:breakpad_handler',
             '../chrome/chrome.gyp:automation',
             '../chrome/chrome.gyp:chrome_dll_version',
-            '../chrome/installer/installer.gyp:installer_util',
+            '../chrome/chrome.gyp:installer_util',
             '../google_update/google_update.gyp:google_update',
           ],
           'configurations': {
             'Debug_Base': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
                 },
               },
             },
@@ skipping 46 matching lines @@
         '<(INTERMEDIATE_DIR)',
       ],
       'resource_include_dirs': [
         '<(INTERMEDIATE_DIR)',
       ],
       'conditions': [
         ['OS=="win"', {
           'dependencies': [
             # TODO(slightlyoff): Get automation targets working on OS X
             '../chrome/chrome.gyp:automation',
-            '../chrome/installer/installer.gyp:installer_util',
+            '../chrome/chrome.gyp:installer_util',
             '../google_update/google_update.gyp:google_update',
           ]
         }],
       ],
     },
 
     {
       'target_name': 'chrome_frame_npapi',
       'type': 'static_library',
       'dependencies': [
@@ skipping 212 matching lines @@
           #   compiler, tickled by the xul_include_dirs variable
           'resource_include_dirs': [
             '<(INTERMEDIATE_DIR)'
           ],
           'dependencies': [
             '../breakpad/breakpad.gyp:breakpad_handler',
             '../chrome/chrome.gyp:automation',
             # Make the archive build happy.
             '../chrome/chrome.gyp:syncapi',
             # Installer
-            '../chrome/installer/installer.gyp:installer_util',
+            '../chrome/chrome.gyp:installer_util',
             '../google_update/google_update.gyp:google_update',
             # Crash Reporting
             'crash_reporting/crash_reporting.gyp:crash_report',
             'crash_reporting/crash_reporting.gyp:minidump_test',
             'crash_reporting/crash_reporting.gyp:vectored_handler_tests',
           ],
         },],
       ],
       'rules': [
         {
@@ skipping 69 matching lines @@
           ],
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_frame_resources.rc',
           ],
           'dependencies': [
             '../breakpad/breakpad.gyp:breakpad_handler',
             '../chrome/chrome.gyp:automation',
             # Make the archive build happy.
             '../chrome/chrome.gyp:syncapi',
             # Installer
-            '../chrome/installer/installer.gyp:installer_util',
+            '../chrome/chrome.gyp:installer_util',
             '../google_update/google_update.gyp:google_update',
             # Crash Reporting
             'crash_reporting/crash_reporting.gyp:crash_report',
             'crash_reporting/crash_reporting.gyp:vectored_handler_tests',
           ],
           'link_settings': {
             'libraries': [
               '-lshdocvw.lib',
             ],
           },
@@ skipping 13 matching lines @@
   ],
 }
 
 # vim: shiftwidth=2:et:ai:tabstop=2
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: