Revert 198834 "Add chrome_split_dll gyp variable, and duplicate ..."

trunk/src/chrome/chrome_dll.gypi

 # Copyright (c) 2012 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': {
-    'browser_dll_sources': [
-      'app/chrome_command_ids.h',
-      'app/chrome_dll.rc',
-      'app/chrome_dll_resource.h',
-      'app/chrome_main.cc',
-      'app/chrome_main_delegate.cc',
-      'app/chrome_main_delegate.h',
-      'app/delay_load_hook_win.cc',
-      'app/delay_load_hook_win.h',
-
-      '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc',
-      '../base/win/dllmain.cc',
-
-      '../ui/resources/cursors/aliasb.cur',
-      '../ui/resources/cursors/cell.cur',
-      '../ui/resources/cursors/col_resize.cur',
-      '../ui/resources/cursors/copy.cur',
-      '../ui/resources/cursors/none.cur',
-      '../ui/resources/cursors/row_resize.cur',
-      '../ui/resources/cursors/vertical_text.cur',
-      '../ui/resources/cursors/zoom_in.cur',
-      '../ui/resources/cursors/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/chrome_unscaled_resources.rc',
-      '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
-      '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
-      '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
-      '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
-      '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc',
-      '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
-    ],
-    'delay_load_dlls_win': [
-      'comdlg32.dll',
-      'crypt32.dll',
-      'cryptui.dll',
-      'dhcpcsvc.dll',
-      'imagehlp.dll',
-      'imm32.dll',
-      'iphlpapi.dll',
-      'setupapi.dll',
-      'urlmon.dll',
-      'winhttp.dll',
-      'wininet.dll',
-      'winspool.drv',
-      'ws2_32.dll',
-      'wsock32.dll',
-    ],
-    'browser_dependencies_win': [
-      # On Windows, link the dependencies (libraries) that make
-      # up actual Chromium functionality into this .dll.
-      'chrome_resources.gyp:chrome_resources',
-      'chrome_version_resources',
-      '../chrome/chrome_resources.gyp:chrome_unscaled_resources',
-      '../crypto/crypto.gyp:crypto',
-      '../printing/printing.gyp:printing',
-      '../net/net.gyp:net_resources',
-      '../third_party/cld/cld.gyp:cld',
-      '../ui/views/views.gyp:views',
-      '../webkit/support/webkit_support.gyp:webkit_resources',
-    ],
-    'manifest_files_win': '$(ProjectDir)\\app\\chrome.dll.manifest',
-  },
   'conditions': [
     ['OS=="mac" or OS=="win"', {
       'targets': [
         {
           'target_name': 'chrome_dll',
           'type': 'none',
           'dependencies': [
             'chrome_main_dll',
           ],
           'conditions': [
@@ skipping 52 matching lines @@
             }],
           ]
         },
         {
           'target_name': 'chrome_main_dll',
           'type': 'shared_library',
           'variables': {
             'enable_wexit_time_destructors': 1,
           },
           'dependencies': [
-            '<@(chromium_browser_dependencies)',
-            '<@(chromium_child_dependencies)',
-            'chrome_dll_pdb_workaround',
-            '../content/content.gyp:content_worker',
+            '<@(chromium_dependencies)',
             'app/policy/cloud_policy_codegen.gyp:policy',
           ],
           'conditions': [
             ['use_aura==1', {
               'dependencies': [
                 '../ui/compositor/compositor.gyp:compositor',
               ],
             }],
             ['use_ash==1', {
               'sources': [
                 '<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources/ash_wallpaper_resources.rc',
               ],
             }],
             ['OS=="win" and target_arch=="ia32"', {
               # Add a dependency to custom import library for user32 delay
               # imports only in x86 builds.
               'dependencies': [
                 'chrome_user32_delay_imports',
               ],
             },],
             ['OS=="win"', {
               'product_name': 'chrome',
               'dependencies': [
-                '<@(browser_dependencies_win)',
+                # On Windows, link the dependencies (libraries) that make
+                # up actual Chromium functionality into this .dll.
+                'chrome_dll_pdb_workaround',
+                'chrome_resources.gyp:chrome_resources',
+                'chrome_version_resources',
+                '../chrome/chrome_resources.gyp:chrome_unscaled_resources',
+                '../content/content.gyp:content_worker',
+                '../crypto/crypto.gyp:crypto',
+                '../printing/printing.gyp:printing',
+                '../net/net.gyp:net_resources',
+                '../third_party/cld/cld.gyp:cld',
+                '../ui/views/views.gyp:views',
+                '../webkit/support/webkit_support.gyp:webkit_resources',
               ],
               'sources': [
-                '<@(browser_dll_sources)',
+                'app/chrome_command_ids.h',
+                'app/chrome_dll.rc',
+                'app/chrome_dll_resource.h',
+                'app/chrome_main.cc',
+                'app/chrome_main_delegate.cc',
+                'app/chrome_main_delegate.h',
+                'app/delay_load_hook_win.cc',
+                'app/delay_load_hook_win.h',
+
+                '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc',
+                '../base/win/dllmain.cc',
+
+                '../ui/resources/cursors/aliasb.cur',
+                '../ui/resources/cursors/cell.cur',
+                '../ui/resources/cursors/col_resize.cur',
+                '../ui/resources/cursors/copy.cur',
+                '../ui/resources/cursors/none.cur',
+                '../ui/resources/cursors/row_resize.cur',
+                '../ui/resources/cursors/vertical_text.cur',
+                '../ui/resources/cursors/zoom_in.cur',
+                '../ui/resources/cursors/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/chrome_unscaled_resources.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
               ],
               'include_dirs': [
                 '<(DEPTH)/third_party/wtl/include',
               ],
+              'defines': [
+                'CHROME_DLL',
+                'BROWSER_DLL',
+                'RENDERER_DLL',
+                'PLUGIN_DLL',
+              ],
               'configurations': {
                 'Debug_Base': {
                   'msvs_settings': {
                     'VCLinkerTool': {
                       'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
                     },
                   },
                 },
               },
               'msvs_settings': {
@@ skipping 32 matching lines @@
                         '<(DEPTH)/build/win/importlibs/x86',
                       ],
                       'ForceSymbolReferences': [
                         # Force the inclusion of the delay load hook in this
                         # binary.
                         '_ChromeDelayLoadHook@8',
                       ],
                     }],
                   ],
                   'DelayLoadDLLs': [
-                    '<@(delay_load_dlls_win)',
+                    'comdlg32.dll',
+                    'crypt32.dll',
+                    'cryptui.dll',
+                    'dhcpcsvc.dll',
+                    'imagehlp.dll',
+                    'imm32.dll',
+                    'iphlpapi.dll',
+                    'setupapi.dll',
+                    'urlmon.dll',
+                    'winhttp.dll',
+                    'wininet.dll',
+                    'winspool.drv',
+                    'ws2_32.dll',
+                    'wsock32.dll',
                   ],
                 },
                 'VCManifestTool': {
-                  'AdditionalManifestFiles': '<(manifest_files_win)',
+                  'AdditionalManifestFiles': '$(ProjectDir)\\app\\chrome.dll.manifest',
                 },
               },
             }],  # OS=="win"
             ['OS=="mac" and component!="shared_library"', {
               'includes': [ 'chrome_dll_bundle.gypi' ],
             }],
             ['OS=="mac" and component=="shared_library"', {
               'xcode_settings': { 'OTHER_LDFLAGS': [ '-Wl,-ObjC' ], },
             }],
             ['OS=="mac"', {
@@ skipping 49 matching lines @@
                   ],
                 }],  # mac_breakpad_compiled_in
                 ['internal_pdf', {
                   'dependencies': [
                     '../pdf/pdf.gyp:pdf',
                   ],
                 }],
               ],  # conditions
             }],  # OS=="mac"
           ],  # conditions
-        },  # target chrome_main_dll
-        {
-          'target_name': 'chrome_browser_dll',
-          'type': 'shared_library',
-          'variables': {
-            'enable_wexit_time_destructors': 1,
-          },
-          'dependencies': [
-            '<@(chromium_browser_dependencies)',
-            'app/policy/cloud_policy_codegen.gyp:policy',
-            # TODO(scottmg): http://crbug.com/237249 Probably should be
-            # renderer.
-            '../ppapi/ppapi_internal.gyp:ppapi_host',
-          ],
-          'conditions': [
-            ['use_aura==1', {
-              'dependencies': [
-                '../ui/compositor/compositor.gyp:compositor',
-              ],
-            }],
-            ['use_ash==1', {
-              'sources': [
-                '<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources/ash_wallpaper_resources.rc',
-              ],
-            }],
-            ['OS=="win"', {
-              'product_name': 'chrome_browser',
-              'dependencies': [
-                '<@(browser_dependencies_win)',
-              ],
-              'sources': [
-                '<@(browser_dll_sources)',
-              ],
-              'include_dirs': [
-                '<(DEPTH)/third_party/wtl/include',
-              ],
-              'msvs_settings': {
-                'VCLinkerTool': {
-                  'BaseAddress': '0x01c30000',
-                  'ImportLibrary': '$(OutDir)\\lib\\chrome_browser_dll.lib',
-                  # Set /SUBSYSTEM:WINDOWS for chrome_browser.dll (for consistency).
-                  'SubSystem': '2',
-                  'DelayLoadDLLs': [
-                    '<@(delay_load_dlls_win)',
-                  ],
-                },
-                'VCManifestTool': {
-                  'AdditionalManifestFiles': '<(manifest_files_win)',
-                },
-              },
-            }],  # OS=="win"
-          ],  # conditions
-        },  # target chrome_browser_dll
+        },  # target chrome_dll
       ],  # targets
     }],  # OS=="mac" or OS=="win"
     ['OS=="win"', {
       'targets': [
         {
           # This target is only depended upon on Windows.
           'target_name': 'chrome_dll_pdb_workaround',
           'type': 'static_library',
           'sources': [ 'empty_pdb_workaround.cc' ],
           'conditions': [
             ['fastbuild==0 or win_z7!=0', {
              'msvs_settings': {
               'VCCLCompilerTool': {
                 # This *in the compile phase* must match the pdb name that's
                 # output by the final link. See empty_pdb_workaround.cc for
                 # more details.
                 'DebugInformationFormat': '3',
                 'ProgramDataBaseFileName': '<(PRODUCT_DIR)/chrome.dll.pdb',
               },
              },
             }],
           ],
         },
       ],
     }],
   ],
 }