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

Caused Linux x64 sizes to fail for reasons unclear.

> Create top-level separate targets for browser and child dlls
> 
> The general idea is that there's top level targets chrome and chrome_child,
> and corresponding content_app and content_app_child that depend on only
> the subtargets that should be included in the appropriate dll.
> 
> Pull bluetooth_utils from bluetooth_device into separate common target
> as it's referenced from chrome/common/extensions.
> 
> Currently (probably) Windows-only and requires setting chrome_multiple_dll=1
> for gyp.
> 
> Links, but Blink is still included in browser.
> 
> Single-process mode is currently disabled when chrome_multiple_dll is set.
> 
> Current graph is at: http://commondatastorage.googleapis.com/chromelinkgraph/deps.html
> generated by "python tools\win\split_link\graph_dependencies.py deps.html"
> 
> Remove the previous hacky-er attempt at this that was named "split dll".
> 
> TBR=jam@chromium.org
> 
> BUG=237249,256965
> 
> Review URL: https://codereview.chromium.org/17619005

TBR=scottmg@chromium.org

Review URL: https://codereview.chromium.org/19572012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212239 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 32 deletions

diff --git a/content/content.gyp b/content/content.gyp
index f938e36..4def8b2 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -52,7 +52,7 @@
             'content_common',
           ],
           'conditions': [
-            ['OS != "ios"', {
+            ['OS != "ios" and chrome_split_dll != 1', {
               'dependencies': [
                 'content_gpu',
                 'content_plugin',
@@ -74,31 +74,6 @@
           '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',
@@ -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'],