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

trunk/src/content/content.gyp

 # 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': {
     'chromium_code': 1,  # Use higher warning level.
     'chromium_enable_vtune_jit_for_v8%': 0,  # enable the vtune support for V8 engine.
     'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/directxsdk)',
   },
@@ skipping 34 matching lines @@
         {
           'target_name': 'content',
           'type': 'none',
           'dependencies': [
             'content_app',
             'content_browser',
             'content_child',
             'content_common',
           ],
           'conditions': [
-            ['OS != "ios"', {
+            ['OS != "ios" and chrome_split_dll != 1', {
               'dependencies': [
                 'content_gpu',
                 'content_plugin',
                 'content_ppapi_plugin',
                 'content_renderer',
                 'content_utility',
                 'content_worker',
               ],
             }],
           ],
         },
         {
           'target_name': 'content_app',
           'type': 'static_library',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'includes': [
             'content_app.gypi',
           ],
           'dependencies': [
             'content_common',
           ],
-          'conditions': [
-            ['chrome_multiple_dll', {
-              'defines': [
-                'CHROME_MULTIPLE_DLL_BROWSER',
-              ],
-            }],
-          ],
-        },
-        {
-          'target_name': 'content_app_child',
-          'type': 'static_library',
-          'variables': { 'enable_wexit_time_destructors': 1, },
-          'includes': [
-            'content_app.gypi',
-          ],
-          'dependencies': [
-            'content_common',
-          ],
-          'conditions': [
-            ['chrome_multiple_dll', {
-              'defines': [
-                'CHROME_MULTIPLE_DLL_CHILD',
-              ],
-            }],
-          ],
         },
         {
           'target_name': 'content_browser',
           'type': 'static_library',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'includes': [
             'content_browser.gypi',
           ],
           'dependencies': [
             'content_common',
             'content_resources.gyp:content_resources',
           ],
           'conditions': [
-            ['OS != "ios"', {
+            ['OS != "ios" and chrome_split_dll != 1', {
               'dependencies': [
                 'content_gpu',
+                'content_renderer',
                 'content_utility',
               ],
             }],
+            ['chrome_split_dll', {
+              'dependencies': [
+                'content_gpu',
+              ],
+            }],
             ['java_bridge==1', {
               'dependencies': [
                 'content_child',
               ]
             }]
           ],
         },
         {
           'target_name': 'content_common',
           'type': 'static_library',
@@ skipping 155 matching lines @@
               ],
             },
           },
         },
         {
           'target_name': 'content_app',
           'type': 'none',
           'dependencies': ['content', 'content_browser'],
         },
         {
-          'target_name': 'content_app_child',
-          'type': 'none',
-          'dependencies': ['content', 'content_child'],
-        },
-        {
           'target_name': 'content_browser',
           'type': 'none',
           'dependencies': ['content'],
         },
         {
           'target_name': 'content_common',
           'type': 'none',
           'dependencies': ['content', 'content_resources.gyp:content_resources'],
           # Disable c4267 warnings until we fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267, ],
@@ skipping 168 matching lines @@
             'include_dirs': [
               '<(SHARED_INTERMEDIATE_DIR)/content',
             ],
           },
           'includes': [ 'content_jni.gypi' ],
         },
       ],
     }],  # OS == "android"
   ],
 }