diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-22 07:38:52 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-22 07:38:52 +0000 |
| commit | ee582a571a88eaf76f922cb43d448b38f5e4f36a (patch) | |
| tree | 51a9cbe4c641705e260239d0010745f273d79d68 /content/content.gyp | |
| parent | e5b7f0e9e49009a05432242493b6d74ae130848f (diff) | |
| download | chromium_src-ee582a571a88eaf76f922cb43d448b38f5e4f36a.zip chromium_src-ee582a571a88eaf76f922cb43d448b38f5e4f36a.tar.gz chromium_src-ee582a571a88eaf76f922cb43d448b38f5e4f36a.tar.bz2 | |
Allow for building content_shell from within WebKit
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10388218
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138231 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content.gyp')
| -rw-r--r-- | content/content.gyp | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/content/content.gyp b/content/content.gyp index ce006f1..737479f 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 |