Adding a secondary mini_installer target for Chrome Frame. This will remove t...

build/all.gyp

 # Copyright (c) 2009 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.
 
 {
   'targets': [
     {
       'target_name': 'All',
       'type': 'none',
       'xcode_create_dependents_test_runner': 1,
@@ skipping 28 matching lines @@
         '../webkit/webkit.gyp:*',
         'util/build_util.gyp:*',
         'temp_gyp/googleurl.gyp:*',
       ],
       'conditions': [
         ['javascript_engine=="v8"', {
           'dependencies': [
             '../v8/tools/gyp/v8.gyp:*',
           ],
         }],
-        ['chrome_frame_define==1', {
-          'dependencies': [
-            '../chrome_frame/chrome_frame.gyp:*',
-          ],
-        }],
         ['OS=="mac" or OS=="linux" or OS=="freebsd"', {
           'dependencies': [
             '../third_party/yasm/yasm.gyp:*#host',
            ],
         }],
         ['OS=="mac"', {
           'dependencies': [
             '../third_party/ocmock/ocmock.gyp:*',
           ],
         }],
@@ skipping 22 matching lines @@
           'conditions': [
             ['win_use_allocator_shim==1', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:*',
               ],
             }],
           ],
           'dependencies': [
             '../breakpad/breakpad.gyp:*',
             '../chrome/app/locales/locales.gyp:*',
+            '../chrome_frame/chrome_frame.gyp:*',
             '../courgette/courgette.gyp:*',
             '../gears/gears.gyp:*',
             '../gpu/demos/demos.gyp:*',
             '../gpu/gpu.gyp:*',
             '../rlz/rlz.gyp:*',
             '../sandbox/sandbox.gyp:*',
             '../third_party/bsdiff/bsdiff.gyp:*',
             '../third_party/bspatch/bspatch.gyp:*',
             '../third_party/cld/cld.gyp:*',
             '../third_party/gles2_book/gles2_book.gyp:*',
@@ skipping 96 matching lines @@
             '../chrome/chrome.gyp:sync_unit_tests',
             '../chrome/chrome.gyp:tab_switching_test',
             '../chrome/chrome.gyp:ui_tests',
             '../chrome/chrome.gyp:unit_tests',
             '../chrome/chrome.gyp:url_fetch_test',
             '../chrome/installer/installer.gyp:installer_util_unittests',
             '../chrome/installer/installer.gyp:mini_installer_test',
             # mini_installer_tests depends on mini_installer. This should be
             # defined in installer.gyp.
             '../chrome/installer/mini_installer.gyp:mini_installer',
+            '../chrome/installer/mini_installer.gyp:chrome_frame_mini_installer',
             '../courgette/courgette.gyp:courgette_unittests',
             '../ipc/ipc.gyp:ipc_tests',
             '../media/media.gyp:media_unittests',
             '../printing/printing.gyp:printing_unittests',
             '../webkit/tools/test_shell/test_shell.gyp:npapi_layout_test_plugin',
             # TODO(nsylvain) ui_tests.exe depends on test_shell_common.
             # This should:
             # 1) not be the case. OR.
             # 2) be expressed in the ui tests dependencies.
             '../webkit/tools/test_shell/test_shell.gyp:test_shell_common',
             'temp_gyp/googleurl.gyp:googleurl_unittests',
             '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
             '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
             '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
             '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
             '../chrome_frame/chrome_frame.gyp:npchrome_frame',
           ],
         },
         {
           # TODO(robertshield): Remove this target once the last independent
           # CF builder is retired.
           'target_name': 'chrome_frame_builder',
           'type': 'none',
           'dependencies': [
             '../chrome/installer/installer.gyp:installer_util_unittests',
             '../chrome/installer/installer.gyp:mini_installer_test',
             # mini_installer_tests depends on mini_installer. This should be
             # defined in installer.gyp.
             '../chrome/installer/mini_installer.gyp:mini_installer',
+            '../chrome/installer/mini_installer.gyp:chrome_frame_mini_installer',
             '../courgette/courgette.gyp:courgette_unittests',
             '../chrome/chrome.gyp:chrome',
             '../chrome_frame/chrome_frame.gyp:npchrome_frame',
             '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
             '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
             '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
             '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
           ],
         },
       ],  # targets
     }], # OS="win"
   ], # conditions
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: