Create top-level separate targets for browser and child dlls

content/content.gyp

Index: content/content.gyp
diff --git a/content/content.gyp b/content/content.gyp
index 4def8b2d161293bf7b6cacb395e48742852d747d..e0d253baa19004edbc1acffe125d312043b23620 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -43,7 +43,7 @@
       ],
       'targets': [
         {
-          'target_name': 'content',
+          'target_name': 'content_all',
           'type': 'none',
           'dependencies': [
             'content_app',
@@ -52,7 +52,7 @@
             'content_common',
           ],
           'conditions': [
-            ['OS != "ios" and chrome_split_dll != 1', {
+            ['OS != "ios"', {
               'dependencies': [
                 'content_gpu',
                 'content_plugin',
@@ -74,6 +74,31 @@
           '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',
@@ -87,18 +112,12 @@
             'content_resources.gyp:content_resources',
           ],
           'conditions': [
-            ['OS != "ios" and chrome_split_dll != 1', {
+            ['OS != "ios"', {
               'dependencies': [
                 'content_gpu',
-                'content_renderer',
                 'content_utility',
               ],
             }],
-            ['chrome_split_dll', {
-              'dependencies': [
-                'content_gpu',
-              ],
-            }],
             ['java_bridge==1', {
               'dependencies': [
                 'content_child',
@@ -228,7 +247,7 @@
     {  # component != static_library
       'targets': [
         {
-          'target_name': 'content',
+          'target_name': 'content_all',
           'type': 'shared_library',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
@@ -271,56 +290,56 @@
         {
           'target_name': 'content_app',
           'type': 'none',
-          'dependencies': ['content', 'content_browser'],
+          'dependencies': ['content_all', 'content_browser'],
         },
         {
           'target_name': 'content_browser',
           'type': 'none',
-          'dependencies': ['content'],
+          'dependencies': ['content_all'],
         },
         {
           'target_name': 'content_common',
           'type': 'none',
-          'dependencies': ['content', 'content_resources.gyp:content_resources'],
+          'dependencies': ['content_all', 'content_resources.gyp:content_resources'],
           # Disable c4267 warnings until we fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267, ],
         },
         {
           'target_name': 'content_child',
           'type': 'none',
-          'dependencies': ['content'],
+          'dependencies': ['content_all'],
         },
         {
           'target_name': 'content_gpu',
           'type': 'none',
-          'dependencies': ['content'],
+          'dependencies': ['content_all'],
         },
         {
           'target_name': 'content_plugin',
           'type': 'none',
-          'dependencies': ['content'],
+          'dependencies': ['content_all'],
         },
         {
           'target_name': 'content_ppapi_plugin',
           'type': 'none',
-          'dependencies': ['content'],
+          'dependencies': ['content_all'],
           # Disable c4267 warnings until we fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267, ],
         },
         {
           'target_name': 'content_renderer',
           'type': 'none',
-          'dependencies': ['content'],
+          'dependencies': ['content_all'],
         },
         {
           'target_name': 'content_utility',
           'type': 'none',
-          'dependencies': ['content'],
+          'dependencies': ['content_all'],
         },
         {
           'target_name': 'content_worker',
           'type': 'none',
-          'dependencies': ['content'],
+          'dependencies': ['content_all'],
         },
       ],
     }],
@@ -439,7 +458,7 @@
           'target_name': 'java_set_jni_headers',
           'type': 'none',
           'variables': {
-            'jni_gen_package': 'content',
+            'jni_gen_package': 'content_all',
             'input_java_class': 'java/util/HashSet.class',
           },
           'includes': [ '../build/jar_file_jni_generator.gypi' ],