diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 23:32:06 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 23:32:06 +0000 |
| commit | 0ba831c266931ef2a76ccfe7fa5b58c3f6a27a01 (patch) | |
| tree | 69f0d3b2b205689917fc35ad270d7f05327fa7db /webkit/webkit.gyp | |
| parent | 6a736b1bf26a4b56f5eee6a8532df77b68b31582 (diff) | |
| download | chromium_src-0ba831c266931ef2a76ccfe7fa5b58c3f6a27a01.zip chromium_src-0ba831c266931ef2a76ccfe7fa5b58c3f6a27a01.tar.gz chromium_src-0ba831c266931ef2a76ccfe7fa5b58c3f6a27a01.tar.bz2 | |
Add build_webkit_exes_from_webkit_gyp flag to build/common.gypi
This is the first step in splitting up the circular dependencies between
DRT, webkit_support, and webkit. This change should be a no-op for now.
R=tony@chromium.org
BUG=https://bugs.webkit.org/show_bug.cgi?id=68463
Review URL: http://codereview.chromium.org/8589013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111436 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/webkit.gyp')
| -rw-r--r-- | webkit/webkit.gyp | 49 |
1 files changed, 36 insertions, 13 deletions
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index d696016..81dd6b8 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -11,20 +11,43 @@ 'variables': { 'chromium_code': 1, }, - 'targets': [ - { - 'target_name': 'pull_in_webkit_unit_tests', - 'type': 'none', - 'dependencies': [ - '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit_unit_tests' + 'conditions': [ + # TODO(dpranke): See https://bugs.webkit.org/show_bug.cgi?id=68463 , + # flag in build/common.gypi. + ['build_webkit_exes_from_webkit_gyp==1', { + 'targets': [ + { + 'target_name': 'pull_in_webkit_unit_tests', + 'type': 'none', + 'dependencies': [ + '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit_unit_tests' + ], + }, + { + 'target_name': 'pull_in_DumpRenderTree', + 'type': 'none', + 'dependencies': [ + '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:DumpRenderTree' + ], + } ], - }, - { - 'target_name': 'pull_in_DumpRenderTree', - 'type': 'none', - 'dependencies': [ - '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:DumpRenderTree' + }, { + 'targets': [ + { + 'target_name': 'pull_in_webkit_unit_tests', + 'type': 'none', + 'dependencies': [ + '../third_party/WebKit/Source/WebKit/chromium/WebKitTest.gyp:webkit_unit_tests' + ], + }, + { + 'target_name': 'pull_in_DumpRenderTree', + 'type': 'none', + 'dependencies': [ + '../third_party/WebKit/Tools/Tools.gyp:DumpRenderTree' + ], + } ], - }, + }] ], # targets } |