| Index: content/content.gyp
|
| diff --git a/content/content.gyp b/content/content.gyp
|
| index ce006f157e45a1229c281d3333d47213ecf1138b..737479fc071c03f82b35b27baaff88b47c031ad0 100644
|
| --- a/content/content.gyp
|
| +++ b/content/content.gyp
|
| @@ -6,16 +6,34 @@
|
| '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==0', {
|
| + 'dependencies': [
|
| + '../webkit/support/setup_third_party.gyp:third_party_headers',
|
| + ],
|
| + }],
|
| + ],
|
| },
|
| '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
|
|
|