Updates prior to cutting over chrome.dll to gyp generation:...

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
@@ skipping 3807 matching lines @@
           'include_dirs': [
             'third_party/wtl/include',
           ],
           'dependencies': [
             # On Windows, link the dependencies (libraries) that make
             # up actual Chromium functionality into this .dll.
             '<@(chromium_dependencies)',
             'chrome_dll_version',
             'chrome_resources',
             'installer/installer.gyp:installer_util_strings',
+            # TODO(sgk):  causes problems because theme_dll doesn't
+            # actually generate default.lib, but now expects it.
+            #'theme_dll',
             'worker',
             '../net/net.gyp:net_resources',
             '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
             '../views/views.gyp:views',
             '../webkit/webkit.gyp:webkit_resources',
             '../gears/gears.gyp:gears',
           ],
+          'defines': [
+            'CHROME_DLL',
+            'BROWSER_DLL',
+            'RENDERER_DLL',
+            'PLUGIN_DLL',
+          ],
           'sources': [
             'app/chrome_dll.rc',
             'app/chrome_dll_main.cc',
             'app/chrome_dll_resource.h',
-            '<(grit_out_dir)/chrome_dll_version/chrome_dll_version.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
 
             '../webkit/glue/resources/aliasb.cur',
             '../webkit/glue/resources/cell.cur',
             '../webkit/glue/resources/col_resize.cur',
             '../webkit/glue/resources/copy.cur',
             '../webkit/glue/resources/row_resize.cur',
             '../webkit/glue/resources/vertical_text.cur',
             '../webkit/glue/resources/zoom_in.cur',
             '../webkit/glue/resources/zoom_out.cur',
+
+            # TODO:  It would be nice to have these pulled in
+            # automatically from direct_dependent_settings in
+            # their various targets (net.gyp:net_resources, etc.),
+            # but that causes errors in other targets when
+            # resulting .res files get referenced multiple times.
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/debugger_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
+
             # TODO(sgk):  left-over from pre-gyp build, figure out
             # if we still need them and/or how to update to gyp.
             #'app/check_dependents.bat',
             #'app/chrome.dll.deps',
           ],
           'msvs_settings': {
             'VCLinkerTool': {
+              'BaseAddress': '0x01c30000',
+              'DelayLoadDLLs': 'crypt32.dll;cryptui.dll;winhttp.dll;wininet.dll;wsock32.dll;ws2_32.dll;winspool.drv;comdlg32.dll;imagehlp.dll;psapi.dll;urlmon.dll;imm32.dll',
               'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib',
               # Set /SUBSYSTEM:WINDOWS for chrome.dll (for consistency).
               'SubSystem': '2',
             },
           },
           'configurations': {
             'Debug': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '1',       # /INCREMENTAL:NO
                 },
               },
             },
           },
         },
         {
           'target_name': 'chrome_dll_version',
           'type': 'none',
           #'msvs_guid': '414D4D24-5D65-498B-A33F-3A29AD3CDEDC',
           'dependencies': [
             '../build/util/build_util.gyp:lastchange',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
-              '<(grit_out_dir)/chrome_dll_version',
+              '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version',
             ],
           },
           'actions': [
             {
               'action_name': 'version',
               'variables': {
                 'lastchange_path':
                   '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
                 'version_py': 'tools/build/version.py',
                 'version_path': 'VERSION',
@@ skipping 10 matching lines @@
                   },
                 }],
               ],
               'inputs': [
                 '<(template_input_path)',
                 '<(version_path)',
                 '<(branding_path)',
                 '<(lastchange_path)',
               ],
               'outputs': [
-                '<(grit_out_dir)/chrome_dll_version/chrome_dll_version.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
               ],
               'action': [
                 'python',
                 '<(version_py)',
                 '-f', '<(version_path)',
                 '-f', '<(branding_path)',
                 '-f', '<(lastchange_path)',
                 '<(template_input_path)',
                 '<@(_outputs)',
               ],
-              'process_outputs_as_sources': 1,
               'message': 'Generating version information in <(_outputs)'
             },
           ],
         },
         {
           'target_name': 'activex_test_control',
           'type': 'shared_library',
           'msvs_guid': '414D4D24-5D65-498B-A33F-3A29AD3CDEDC',
           'include_dirs': [
             '..',
@@ skipping 560 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'
 }