Allow for building content_shell from within WebKit

content/content.gyp

Index: content/content.gyp
diff --git a/content/content.gyp b/content/content.gyp
index ce006f157e45a1229c281d3333d47213ecf1138b..b53ec4fd3efa3144dbc3c320c5a5e79c59bb2e04 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -6,16 +6,27 @@
   'variables': {
     'chromium_code': 1,  # Use higher warning level.
     'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/directxsdk)',
+    'conditions': [
+      ['inside_chromium_build==0', {
+        'webkit_src_dir': '../../../..',
+      },{
+        'webkit_src_dir': '../third_party/WebKit',
+      }],
+    ],
   },
   'includes': [
     '../build/win_precompile.gypi',
     'content_shell.gypi',
-    'content_tests.gypi',
   ],
   'target_defaults': {
     'defines': ['CONTENT_IMPLEMENTATION'],
   },
   'conditions': [
+    ['inside_chromium_build==1', {
+      'includes': [
+        'content_tests.gypi',
+      ]
+    }],
    # In component mode, we build all of content as a single DLL.
    # However, in the static mode, we need to build content as multiple
    # targets in order to prevent dependencies from getting introduced
@@ -50,6 +61,13 @@
        'dependencies': [
           'content_common',
         ],
+       'conditions': [

[jam, 2012/05/21 21:44:10]

instead of duplicating this everywhere, can't we put it in target_defaults or
something similar? or just make only content_common depend on this?

[jochen (gone - plz use gerrit), 2012/05/21 22:00:34]

I moved it to target_defaults

+         ['inside_chromium_build==0', {
+           'dependencies': [
+             '../webkit/support/setup_third_party.gyp:third_party_headers',
+           ],
+         }],
+       ],
       },
       {'target_name': 'content_browser',
        'type': 'static_library',
@@ -60,6 +78,13 @@
        'dependencies': [
           'content_common',
         ],
+       'conditions': [
+         ['inside_chromium_build==0', {
+           'dependencies': [
+             '../webkit/support/setup_third_party.gyp:third_party_headers',
+           ],
+         }],
+       ],
       },
       {'target_name': 'content_common',
        'type': 'static_library',
@@ -70,6 +95,13 @@
        'dependencies': [
           'content_resources.gyp:content_resources',
         ],
+       'conditions': [
+         ['inside_chromium_build==0', {
+           'dependencies': [
+             '../webkit/support/setup_third_party.gyp:third_party_headers',
+           ],
+         }],
+       ],
       },
       {'target_name': 'content_gpu',
        'type': 'static_library',
@@ -80,6 +112,13 @@
        'dependencies': [
           'content_common',
         ],
+       'conditions': [
+         ['inside_chromium_build==0', {
+           'dependencies': [
+             '../webkit/support/setup_third_party.gyp:third_party_headers',
+           ],
+         }],
+       ],
       },
       {'target_name': 'content_plugin',
        'type': 'static_library',
@@ -90,6 +129,13 @@
        'dependencies': [
           'content_common',
         ],
+       'conditions': [
+         ['inside_chromium_build==0', {
+           'dependencies': [
+             '../webkit/support/setup_third_party.gyp:third_party_headers',
+           ],
+         }],
+       ],
       },
       {'target_name': 'content_ppapi_plugin',
        'type': 'static_library',
@@ -97,6 +143,13 @@
        'includes': [
           'content_ppapi_plugin.gypi',
         ],
+       'conditions': [
+         ['inside_chromium_build==0', {
+           'dependencies': [
+             '../webkit/support/setup_third_party.gyp:third_party_headers',
+           ],
+         }],
+       ],
       },
       {'target_name': 'content_renderer',
        'type': 'static_library',
@@ -108,6 +161,13 @@
           'content_common',
           'content_resources.gyp:content_resources',
         ],
+       'conditions': [
+         ['inside_chromium_build==0', {
+           'dependencies': [
+             '../webkit/support/setup_third_party.gyp:third_party_headers',
+           ],
+         }],
+       ],
       },
       {'target_name': 'content_utility',
        'type': 'static_library',
@@ -118,6 +178,13 @@
        'dependencies': [
           'content_common',
         ],
+       'conditions': [
+         ['inside_chromium_build==0', {
+           'dependencies': [
+             '../webkit/support/setup_third_party.gyp:third_party_headers',
+           ],
+         }],
+       ],
       },
       {'target_name': 'content_worker',
        'type': 'static_library',
@@ -128,6 +195,13 @@
        'dependencies': [
           'content_common',
         ],
+       'conditions': [
+         ['inside_chromium_build==0', {
+           'dependencies': [
+             '../webkit/support/setup_third_party.gyp:third_party_headers',
+           ],
+         }],
+       ],
       },
      ],
     },
@@ -145,6 +219,11 @@
              '<(DEPTH)/third_party/mach_override/mach_override.gyp:mach_override',
            ],
          }],
+         ['inside_chromium_build==0', {
+           'dependencies': [
+             '../webkit/support/setup_third_party.gyp:third_party_headers',
+           ],
+         }],
        ],
        'includes': [
         'content_app.gypi',