chrome.gyp fixes to preserve various build behaviors...

chrome/chrome.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.
 
 {
   'variables': {
     'chromium_code': 1,
     # Define the common dependencies that contain all the actual
     # Chromium functionality.  This list gets pulled in below by
     # the link of the actual chrome (or chromium) executable on
     # Linux or Mac, and into chrome.dll on Windows.
     'chromium_dependencies': [
       'common',
       'browser',
       'renderer',
       'utility',
       '../printing/printing.gyp:printing',
       '../webkit/webkit.gyp:inspector_resources',
     ],
+    'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
   },
   'includes': [
     '../build/common.gypi',
   ],
   'target_defaults': {
     'sources/': [
       ['exclude', '/(cocoa|gtk|win)/'],
       ['exclude', '_(cocoa|gtk|linux|mac|posix|skia|win|views|x)(_unittest)?\\.(cc|mm?)$'],
       ['exclude', '/(gtk|win|x11)_[^/]*\\.cc$'],
     ],
@@ skipping 132 matching lines @@
           'dependencies': ['../build/win/system.gyp:cygwin'],
         }],
       ],
     },
     {
       # theme_resources also generates a .cc file, so it can't use the rules above.
       'target_name': 'theme_resources',
       'type': 'none',
       'variables': {
         'grit_path': '../tools/grit/grit.py',
-        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
       },
       'actions': [
         {
           'action_name': 'theme_resources',
           'variables': {
             'input_path': 'app/theme/theme_resources.grd',
             'conditions': [
               ['branding=="Chrome"', {
                 # TODO(mmoss) The .grd files look for _google_chrome, but for
                 # consistency they should look for GOOGLE_CHROME_BUILD like C++.
@@ skipping 232 matching lines @@
         'common/visitedlink_common.h',
         'common/webkit_param_traits.h',
         'common/win_safe_util.cc',
         'common/win_safe_util.h',
         'common/worker_thread_ticker.cc',
         'common/worker_thread_ticker.h',
         'common/x11_util.cc',
         'common/x11_util.h',
         'common/x11_util_internal.h',
         'third_party/xdg_user_dirs/xdg_user_dir_lookup.cc',
+
+        'tools/build/win/precompiled.cc',
+        'tools/build/win/precompiled.h',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '..',
         ],
       },
       'export_dependent_settings': [
         '../app/app.gyp:app_base',
       ],
+      'configurations': {
+        'Debug': {
+          'msvs_precompiled_header': 'tools/build/win/precompiled.h',
+          'msvs_precompiled_source': 'tools/build/win/precompiled.cc',
+        },
+      },
       'conditions': [
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
           ],
           'link_settings': {
             'libraries': [
               '-lX11',
               '-lXrender',
               '-lXext',
@@ skipping 1402 matching lines @@
         'plugin/plugin_channel.h',
         'plugin/plugin_channel_base.cc',
         'plugin/plugin_channel_base.h',
         'plugin/plugin_main.cc',
         'plugin/plugin_thread.cc',
         'plugin/plugin_thread.h',
         'plugin/webplugin_delegate_stub.cc',
         'plugin/webplugin_delegate_stub.h',
         'plugin/webplugin_proxy.cc',
         'plugin/webplugin_proxy.h',
+
+        'tools/build/win/precompiled.cc',
+        'tools/build/win/precompiled.h',
       ],
+      'configurations': {
+        'Debug': {
+          'msvs_precompiled_header': 'tools/build/win/precompiled.h',
+          'msvs_precompiled_source': 'tools/build/win/precompiled.cc',
+        },
+      },
       # These are layered in conditionals in the event other platforms
       # end up using this module as well.
       'conditions': [
         ['OS=="win"', {
           'defines': [
             '__STD_C',
             '_CRT_SECURE_NO_DEPRECATE',
             '_SCL_SECURE_NO_DEPRECATE',
           ],
           'include_dirs': [
@@ skipping 99 matching lines @@
         'renderer/user_script_slave.cc',
         'renderer/user_script_slave.h',
         'renderer/visitedlink_slave.cc',
         'renderer/visitedlink_slave.h',
         'renderer/webmediaplayer_impl.cc',
         'renderer/webmediaplayer_impl.h',
         'renderer/webplugin_delegate_proxy.cc',
         'renderer/webplugin_delegate_proxy.h',
         'renderer/webworker_proxy.cc',
         'renderer/webworker_proxy.h',
+
+        'tools/build/win/precompiled_wtl.cc',
+        'tools/build/win/precompiled_wtl.h',
       ],
       'link_settings': {
         'mac_bundle_resources': [
           'renderer/renderer.sb',
         ],
       },
+      'configurations': {
+        'Debug': {
+          'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
+          'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
+        },
+      },
       'conditions': [
         # Linux-specific rules.
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
           ],
         }],
         # Windows-specific rules.
         ['OS=="win"', {
           'include_dirs': [
@@ skipping 882 matching lines @@
       'dependencies': [
         'app',
         'browser',
         'common',
         'renderer',
         'utility',
         'chrome_resources',
         'chrome_strings',
         'test_support_unit',
         '../app/app.gyp:app_resources',
+        '../net/net.gyp:net_resources',
         '../net/net.gyp:net_test_support',
         '../printing/printing.gyp:printing',
         '../webkit/webkit.gyp:webkit',
+        '../webkit/webkit.gyp:webkit_resources',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu38/icu38.gyp:icui18n',
         '../third_party/icu38/icu38.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/npapi/npapi.gyp:npapi',
       ],
       'include_dirs': [
         '..',
       ],
@@ skipping 99 matching lines @@
         'browser/importer/firefox_importer_unittest.cc',
         'browser/importer/importer_unittest.cc',
         'browser/importer/toolbar_importer_unittest.cc',
         'browser/login_prompt_unittest.cc',
         'browser/metrics/metrics_log_unittest.cc',
         'browser/metrics/metrics_response_unittest.cc',
         'browser/net/chrome_url_request_context_unittest.cc',
         'browser/net/dns_host_info_unittest.cc',
         'browser/net/dns_master_unittest.cc',
         'browser/net/resolve_proxy_msg_helper_unittest.cc',
+        'browser/net/test_url_fetcher_factory.cc',
+        'browser/net/test_url_fetcher_factory.h',
         'browser/net/url_fetcher_unittest.cc',
         'browser/net/url_fixer_upper_unittest.cc',
         'browser/password_manager/encryptor_unittest.cc',
         'browser/password_manager/password_form_manager_unittest.cc',
         'browser/printing/page_number_unittest.cc',
         'browser/printing/page_overlays_unittest.cc',
         'browser/printing/page_range_unittest.cc',
         'browser/printing/page_setup_unittest.cc',
         'browser/printing/print_job_unittest.cc',
         'browser/printing/win_printing_context_unittest.cc',
@@ skipping 76 matching lines @@
         'test/render_view_test.h',
         'test/test_notification_tracker.cc',
         'test/test_notification_tracker.h',
         'test/v8_unit_test.cc',
         'test/v8_unit_test.h',
         '../views/controls/label_unittest.cc',
         '../views/controls/table/table_view_unittest.cc',
         '../views/focus/focus_manager_unittest.cc',
         '../views/grid_layout_unittest.cc',
         '../views/view_unittest.cc',
+
+        'tools/build/win/precompiled_wtl.h',
+        'tools/build/win/precompiled_wtl.cc',
       ],
       'conditions': [
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:nss',
           ],
           'sources!': [
             # This test is mostly about renaming downloads to safe file
             # names. As such we don't need/want to port it to linux. We
@@ skipping 44 matching lines @@
           'sources!': [
             'browser/gtk/tabs/tab_renderer_gtk_unittest.cc',
             'common/file_descriptor_set_unittest.cc',
             'common/net/url_util_unittest.cc',
           ],
           'dependencies': [
             '../views/views.gyp:views',
           ],
           'configurations': {
             'Debug': {
+              'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
+              'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '1',       # /INCREMENTAL:NO
                 },
               },
             },
           },
         }, { # else: OS != "win"
           'sources!': [
             'browser/autocomplete/search_provider_unittest.cc',
@@ skipping 70 matching lines @@
         }],
       ],
     },
     {
       'target_name': 'page_cycler_tests',
       'type': 'executable',
       'dependencies': [
         'app',
         'chrome_resources',
         'chrome_strings',
+        'test_support_common',
         'test_support_ui',
         '../base/base.gyp:base',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
       ],
       'sources': [
         'test/page_cycler/page_cycler_test.cc',
         'tools/build/win/precompiled.cc',
         'tools/build/win/precompiled.h',
       ],
@@ skipping 182 matching lines @@
     }],  # OS!="mac"
     ['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': [
             'app/locales.gyp:*',
+            'installer/installer.gyp:*',
             '../app/app.gyp:*',
             '../base/base.gyp:*',
             '../media/media.gyp:*',
             '../net/net.gyp:*',
             '../printing/printing.gyp:*',
             '../sdch/sdch.gyp:*',
             '../skia/skia.gyp:*',
             '../testing/gtest.gyp:*',
             '../third_party/bsdiff/bsdiff.gyp:*',
             '../third_party/bspatch/bspatch.gyp:*',
@@ skipping 338 matching lines @@
         },
         {
           'target_name': 'interactive_ui_tests',
           'type': 'executable',
           'dependencies': [
             'chrome_resources',
             'chrome_strings',
             'test_support_common',
             'test_support_ui',
             'third_party/hunspell/hunspell.gyp:hunspell',
+            '../net/net.gyp:net_resources',
             '../skia/skia.gyp:skia',
             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
             '../third_party/icu38/icu38.gyp:icui18n',
             '../third_party/libpng/libpng.gyp:libpng',
             '../third_party/libxml/libxml.gyp:libxml',
             '../third_party/zlib/zlib.gyp:zlib',
             '../testing/gtest.gyp:gtest',
             '../third_party/npapi/npapi.gyp:npapi',
             '../views/views.gyp:views',
+            '../webkit/webkit.gyp:webkit_resources',
           ],
           'include_dirs': [
             '..',
             'third_party/wtl/include',
           ],
           'sources': [
             'browser/browser_focus_uitest.cc',
             'browser/views/bookmark_bar_view_test.cc',
             'browser/views/constrained_window_impl_interactive_uitest.cc',
             'browser/views/find_bar_win_interactive_uitest.cc',
@@ skipping 192 matching lines @@
             },
           },
         },
         {
           'target_name': 'url_fetch_test',
           'type': 'executable',
           'dependencies': [
             'test_support_common',
             'test_support_ui',
             'theme_resources',
+            '../net/net.gyp:net',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
           ],
           'include_dirs': [
             '..',
+            'third_party/wtl/include',
           ],
           'sources': [
             'test/url_fetch_test/url_fetch_test.cc',
+
+            'tools/build/win/precompiled_wtl.cc',
+            'tools/build/win/precompiled_wtl.h',
           ],
+          'configurations': {
+            'Debug': {
+              'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
+              'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
+            },
+          },
         },
         {
           'target_name': 'worker',
           'type': '<(library)',
           'dependencies': [
             '../base/base.gyp:base',
             '../webkit/webkit.gyp:webkit',
           ],
           'sources': [
             'tools/build/win/precompiled.cc',
@@ skipping 50 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],
   ],  # 'conditions'
 }