diff options
| -rw-r--r-- | build/common.gypi | 6 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 49 |
2 files changed, 42 insertions, 13 deletions
diff --git a/build/common.gypi b/build/common.gypi index 1ea74dde..8f840b4 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -612,6 +612,12 @@ # The Java Bridge is not compiled in by default. 'java_bridge%': 0, + # TODO(dpranke): This determines whether we should attempt to build DRT + # et al. from WebKit/Source/WebKit.gyp or Tools/Tools.gyp. This + # flag should only be needed temporarily. See + # https://bugs.webkit.org/show_bug.cgi?id=68463. + 'build_webkit_exes_from_webkit_gyp%': 1, + 'conditions': [ # Used to disable Native Client at compile time, for platforms where it # isn't supported (ARM) 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 } |