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

trunk/src/content/content.gyp

Index: trunk/src/content/content.gyp
===================================================================
--- trunk/src/content/content.gyp	(revision 212238)
+++ trunk/src/content/content.gyp	(working copy)
@@ -52,7 +52,7 @@
             'content_common',
           ],
           'conditions': [
-            ['OS != "ios"', {
+            ['OS != "ios" and chrome_split_dll != 1', {
               'dependencies': [
                 'content_gpu',
                 'content_plugin',
@@ -74,33 +74,8 @@
           '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, },
@@ -112,12 +87,18 @@
             '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',
@@ -293,11 +274,6 @@
           'dependencies': ['content', 'content_browser'],
         },
         {
-          'target_name': 'content_app_child',
-          'type': 'none',
-          'dependencies': ['content', 'content_child'],
-        },
-        {
           'target_name': 'content_browser',
           'type': 'none',
           'dependencies': ['content'],
Property changes on: trunk/src/content/content.gyp
___________________________________________________________________
Deleted: svn:mergeinfo