Create top-level separate targets for browser and child dlls

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 25 matching lines @@
     # targets in order to prevent dependencies from getting introduced
     # upstream unnecessarily (e.g., content_renderer depends on allocator
     # and chrome_exe depends on content_common but we don't want
     # chrome_exe to have to depend on allocator).
     ['component=="static_library"', {
       'target_defines': [
         'COMPILE_CONTENT_STATICALLY',
       ],
       'targets': [
         {
-          'target_name': 'content',
+          'target_name': 'content_all',

[jam, 2013/07/17 16:23:37]

why do we need content_all? it seems redundant compared to just "content"

[scottmg, 2013/07/17 16:49:35]

it was mostly so that when i was renaming i got an error when on all references
to 'content' (meaning everything) that ought to be content_browser or
content_child instead. renamed back to 'content'.

           'type': 'none',
           'dependencies': [
             'content_app',
             'content_browser',
             'content_child',
             'content_common',
           ],
           'conditions': [
-            ['OS != "ios" and chrome_split_dll != 1', {
+            ['OS != "ios"', {
               '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" 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',
               ]
             }]
           ],
         },
         {
           'target_name': 'content_common',
           'type': 'static_library',
@@ skipping 109 matching lines @@
                 'content_common',
               ],
             },
           ],
         }],
       ],
     },
     {  # component != static_library
       'targets': [
         {
-          'target_name': 'content',
+          'target_name': 'content_all',
           'type': 'shared_library',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
            'content_resources.gyp:content_resources',
           ],
           'conditions': [
             ['OS=="mac"', {
               'dependencies': [
                 '<(DEPTH)/third_party/mach_override/mach_override.gyp:mach_override',
               ],
@@ skipping 22 matching lines @@
                 ['incremental_chrome_dll==1', {
                   'UseLibraryDependencyInputs': "true",
                 }],
               ],
             },
           },
         },
         {
           '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'],
         },
       ],
     }],
     ['OS == "android"', {
       'targets': [
         {
           'target_name': 'common_aidl',
           'type': 'none',
           'variables': {
             'aidl_interface_file': 'public/android/java/src/org/chromium/content/common/common.aidl',
@@ skipping 98 matching lines @@
           'variables': {
             'package_name': 'org/chromium/content/common',
             'template_deps': ['public/common/top_controls_state_list.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
         {
           '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' ],
         },
 
         {
           'target_name': 'content_jni_headers',
           'type': 'none',
           'dependencies': [
             'java_set_jni_headers',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
               '<(SHARED_INTERMEDIATE_DIR)/content',
             ],
           },
           'includes': [ 'content_jni.gypi' ],
         },
       ],
     }],  # OS == "android"
   ],
 }