Revert 212230 "Create top-level separate targets for browser and..."

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.
 {
   'conditions': [
     ['OS=="mac" or OS=="win"', {
       'targets': [
         {
           'target_name': 'chrome_dll',
           'type': 'none',
           'dependencies': [
             'chrome_main_dll',
           ],
           'conditions': [
             ['OS=="mac" and component=="shared_library"', {
               'type': 'shared_library',
               'includes': [ 'chrome_dll_bundle.gypi' ],
               'xcode_settings': {
                 'OTHER_LDFLAGS': [
                   '-Wl,-reexport_library,<(PRODUCT_DIR)/libchrome_main_dll.dylib',
                 ],
               },
             }],  # OS=="mac"
-            ['chrome_multiple_dll==1', {
-              'dependencies': [
-                'chrome_child_dll',
-              ],
-            }],
             ['incremental_chrome_dll==1', {
               # Linking to a different directory and then hardlinking back
               # to OutDir is a workaround to avoid having the .ilk for
               # chrome.exe and chrome.dll conflicting. See crbug.com/92528
               # for more information. Done on the dll instead of the exe so
               # that people launching from VS don't need to modify
               # $(TargetPath) for the exe.
               'actions': [
                 {
                   'action_name': 'hardlink_to_output',
@@ skipping 34 matching lines @@
           ]
         },
         {
           'target_name': 'chrome_main_dll',
           'type': 'shared_library',
           'variables': {
             'enable_wexit_time_destructors': 1,
           },
           'dependencies': [
             '<@(chromium_browser_dependencies)',
+            '<@(chromium_child_dependencies)',
+            '../content/content.gyp:content_worker',
             'app/policy/cloud_policy_codegen.gyp:policy',
           ],
           'conditions': [
             ['use_aura==1', {
               'dependencies': [
                 '../ui/compositor/compositor.gyp:compositor',
               ],
             }],
             ['OS=="win" and target_arch=="ia32"', {
               # Add a dependency to custom import library for user32 delay
@@ skipping 124 matching lines @@
                     'wininet.dll',
                     'winspool.drv',
                     'ws2_32.dll',
                     'wsock32.dll',
                   ],
                 },
                 'VCManifestTool': {
                   'AdditionalManifestFiles': '$(ProjectDir)\\app\\chrome.dll.manifest',
                 },
               },
-            }],
-            ['chrome_multiple_dll==1', {
-              'defines': [
-                'CHROME_MULTIPLE_DLL_BROWSER',
-              ],
-            }, {
-              'dependencies': [
-                '<@(chromium_child_dependencies)',
-                '../content/content.gyp:content_worker',
-              ],
-            }],
+            }],  # 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' ], },
             }],
+            ['chrome_split_dll', {
+              'sources': [
+                # See comment in .cc for explanation.
+                'split_dll_fake_entry.cc',
+              ],
+              'msvs_settings': {
+                'VCLinkerTool': {
+                  'AdditionalOptions': ['/splitlink'],
+                },
+              }
+            }],
             ['OS=="mac"', {
               'xcode_settings': {
                 # Define the order of symbols within the framework.  This
                 # sets -order_file.
                 'ORDER_FILE': 'app/framework.order',
               },
               'sources': [
                 'app/chrome_command_ids.h',
                 'app/chrome_dll_resource.h',
                 'app/chrome_main.cc',
@@ skipping 71 matching lines @@
                 # more details.
                 'DebugInformationFormat': '3',
                 'ProgramDataBaseFileName': '<(PRODUCT_DIR)/chrome.dll.pdb',
               },
              },
             }],
           ],
         },
       ],
     }],
-    ['chrome_multiple_dll', {
-      'targets': [
-        {
-          'target_name': 'chrome_child_dll',
-          'type': 'shared_library',
-          'product_name': 'chrome_child',
-          'variables': {
-            'enable_wexit_time_destructors': 1,
-          },
-          'dependencies': [
-            '<@(chromium_child_dependencies)',
-            '../content/content.gyp:content_worker',
-            'policy_path_parser',
-          ],
-          'defines': [
-            'CHROME_MULTIPLE_DLL_CHILD',
-          ],
-          'sources': [
-            'app/chrome_main.cc',
-            'app/chrome_main_delegate.cc',
-            'app/chrome_main_delegate.h',
-          ],
-        },  # target chrome_child_dll
-      ],
-    }],
   ],
 }