diff options
| -rw-r--r-- | build/common.gypi | 6 | ||||
| -rw-r--r-- | content/content.gyp | 6 | ||||
| -rw-r--r-- | webkit/appcache/webkit_appcache.gypi | 18 | ||||
| -rw-r--r-- | webkit/blob/webkit_blob.gypi | 9 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gypi | 7 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 65 |
6 files changed, 25 insertions, 86 deletions
diff --git a/build/common.gypi b/build/common.gypi index c2cc6d4..684d39b 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -655,12 +655,6 @@ # 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%': 0, - # This flag is only used when disable_nacl==0 and disables all those # subcomponents which would require the installation of a native_client # untrusted toolchain. diff --git a/content/content.gyp b/content/content.gyp index a4fc736..1973d1f 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -22,11 +22,7 @@ # upstream unnecessarily (e.g., content_renderer depends on allocator # and chrome_exe depends on content_common but we don't want # chrome_exe to have to depend on allocator). - # - # TODO(dpranke): Remove the mac conditional once the circular - # dependencies in WebKit.gyp are fixed. - # See https://bugs.webkit.org/show_bug.cgi?id=68463 - ['OS=="mac" or component=="static_library" or incremental_chrome_dll==1', { + ['component=="static_library" or incremental_chrome_dll==1', { 'target_defines': [ 'COMPILE_CONTENT_STATICALLY', ], diff --git a/webkit/appcache/webkit_appcache.gypi b/webkit/appcache/webkit_appcache.gypi index 8f82e59..b4c63b5 100644 --- a/webkit/appcache/webkit_appcache.gypi +++ b/webkit/appcache/webkit_appcache.gypi @@ -16,6 +16,7 @@ { 'target_name': 'appcache', 'variables': { 'enable_wexit_time_destructors': 1, }, + 'type': '<(component)', 'defines': [ 'APPCACHE_IMPLEMENTATION', ], @@ -26,6 +27,7 @@ '<(DEPTH)/net/net.gyp:net', '<(DEPTH)/sql/sql.gyp:sql', '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', ], 'sources': [ # This list contains all .h and .cc in appcache except for test code. @@ -79,27 +81,11 @@ 'webkit_appcache.gypi', ], 'conditions': [ - [# TODO(dpranke): Remove once the circular dependencies in - # WebKit.gyp are fixed on the mac. - # See https://bugs.webkit.org/show_bug.cgi?id=68463 - 'OS=="mac"', { - 'type': 'static_library', - }, { - 'type': '<(component)', - }], ['inside_chromium_build==0', { 'dependencies': [ '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers', ], }], - [# TODO(dpranke): Figure out why this doesn't work outside of - # a webkit build - this seems to be a bug in the make gyp generator. - # See http://code.google.com/p/chromium/issues/detail?id=105299 . - 'OS!="mac" and inside_chromium_build==1', { - 'dependencies': [ - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', - ], - }], ], }, ], diff --git a/webkit/blob/webkit_blob.gypi b/webkit/blob/webkit_blob.gypi index 2acc390..eb5ec2c 100644 --- a/webkit/blob/webkit_blob.gypi +++ b/webkit/blob/webkit_blob.gypi @@ -23,6 +23,7 @@ '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl', '<(DEPTH)/net/net.gyp:net', + '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', ], 'defines': [ 'BLOB_IMPLEMENTATION' @@ -54,14 +55,6 @@ '<(DEPTH)/webkit/support/webkit_support.gyp:glue', ], }], - [# TODO(dpranke): Remove once the circular dependencies in - # WebKit.gyp are fixed on the mac. - # See https://bugs.webkit.org/show_bug.cgi?id=68463 - 'OS!="mac"', { - 'dependencies': [ - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', - ], - }], ], }, ], diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index 5e514c7..60d1be4 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -22,6 +22,13 @@ }, 'targets': [ { + 'target_name': 'pull_in_copy_TestNetscapePlugIn', + 'type': 'none', + 'dependencies': [ + '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:copy_TestNetscapePlugIn' + ], + }, + { 'target_name': 'test_shell_common', 'type': 'static_library', 'variables': { diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 71edcad..f8c302a 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2010 The Chromium Authors. All rights reserved. +# Copyright (c) 2012 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -11,57 +11,20 @@ 'variables': { 'chromium_code': 1, }, - '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_copy_TestNetscapePlugIn', - 'type': 'none', - 'dependencies': [ - '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:copy_TestNestcapePlugIn' - ], - }, - { - '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/WebKitUnitTests.gyp:webkit_unit_tests' ], - }, { # build_webkit_exes_from_webkit_gyp==0 - 'targets': [ - { - 'target_name': 'pull_in_webkit_unit_tests', - 'type': 'none', - 'dependencies': [ - '../third_party/WebKit/Source/WebKit/chromium/WebKitUnitTests.gyp:webkit_unit_tests' - ], - }, - { - 'target_name': 'pull_in_copy_TestNetscapePlugIn', - 'type': 'none', - 'dependencies': [ - '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:copy_TestNetscapePlugIn' - ], - }, - { - 'target_name': 'pull_in_DumpRenderTree', - 'type': 'none', - 'dependencies': [ - '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:DumpRenderTree' - ], - }, + }, + { + 'target_name': 'pull_in_DumpRenderTree', + 'type': 'none', + 'dependencies': [ + '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:DumpRenderTree' ], - }] + }, ], # targets } |