Clean up some dependencies in Chrome Frame

Libraries that depend on other targets cause the propagation of the other targets closure of library targets to all their dependents. This was the case with chrome_frame_ie, which caused npchrome_frame to link gmock and gtest.
Best case, this will slow down the build. 
Worst case we're open to regressions that ship test code, as useful as our unittests are, I don't think users have much appreciation for installing them :).

This may require another change in build\all.gyp, as building the crash tests is no longer implicit in building npchrome_frame.

Also removed the base_noicu target, as all its dependents have a dependency on base.lib, so this won't prevent ICU usage regressions.

TEST=none
BUG=none

Review URL: http://codereview.chromium.org/4406001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65043 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 39 deletions

diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index aa2a5ad..1584f8e 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -60,6 +60,15 @@
   },
   'targets': [
     {
+      # Builds the crash tests in crash_reporting.
+      'target_name': 'chrome_frame_crash_tests',
+      'type': 'none',
+      'dependencies': [
+        'crash_reporting/crash_reporting.gyp:minidump_test',
+        'crash_reporting/crash_reporting.gyp:vectored_handler_tests',
+      ],
+    },
+    {
       # TODO(slightlyoff): de-win23-ify
       'target_name': 'xulrunner_sdk',
       'type': 'none',
@@ -79,40 +88,6 @@
       ],
     },
     {
-      # TODO(slightlyoff): de-win32-ify
-      #
-      # build the base_noicu.lib.
-      'target_name': 'base_noicu',
-      'type': 'none',
-      'dependencies': [
-        '../base/base.gyp:base',
-      ],
-      'actions': [
-        {
-          'action_name': 'combine_libs',
-          'msvs_cygwin_shell': 0,
-          'inputs': [
-            '<(PRODUCT_DIR)/lib/base.lib',
-          ],
-          'outputs': [
-            '<(PRODUCT_DIR)/lib/base_noicu.lib',
-          ],
-          'action': [
-            '<@(python)',
-            'combine_libs.py',
-            '-o', '<@(_outputs)',
-            '-r (icu_|_icu.obj)',
-            '<@(_inputs)'],
-        },
-      ],
-      'direct_dependent_settings': {
-        # linker_settings
-        'libraries': [
-          '<(PRODUCT_DIR)/lib/base_noicu.lib',
-        ],
-      },
-    },
-    {
       'target_name': 'chrome_frame_unittests',
       'type': 'executable',
       'dependencies': [
@@ -499,6 +474,7 @@
       'type': 'executable',
       'msvs_guid': 'A1440368-4089-4E14-8864-D84D3C5714A7',
       'dependencies': [
+        '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../chrome/chrome.gyp:browser',
         '../chrome/chrome.gyp:debugger',
@@ -506,7 +482,6 @@
         '../chrome/chrome.gyp:test_support_common',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
-        'base_noicu',
         'chrome_frame_ie',
         'chrome_frame_npapi',
         'chrome_frame_strings',
@@ -766,8 +741,6 @@
             '../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',
           ],
         },],
       ],
@@ -829,7 +802,7 @@
       'type': 'shared_library',
       'msvs_guid': 'E3DE7E63-D3B6-4A9F-BCC4-5C8169E9C9F2',
       'dependencies': [
-        'base_noicu',
+        '../base/base.gyp:base',
         'chrome_frame_ie',
         'chrome_frame_npapi',
         'chrome_frame_strings',
@@ -889,7 +862,6 @@
             '../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': [