diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-24 01:34:35 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-24 01:34:35 +0000 |
| commit | 47f16765d51098c1562d7ad304f8554c66f603ed (patch) | |
| tree | 1ebd6e60746d455f50ddecab787efc5475293ad5 /webkit/blob | |
| parent | 4bf2e4003851f94c36f4540231572539f10f3596 (diff) | |
| download | chromium_src-47f16765d51098c1562d7ad304f8554c66f603ed.zip chromium_src-47f16765d51098c1562d7ad304f8554c66f603ed.tar.gz chromium_src-47f16765d51098c1562d7ad304f8554c66f603ed.tar.bz2 | |
remove build_webkit_exes_from_webkit_gyp flag
R=tony@chromium.org
BUG=105823
TEST=everything stays green
Review URL: https://chromiumcodereview.appspot.com/9254040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118774 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/blob')
| -rw-r--r-- | webkit/blob/webkit_blob.gypi | 9 |
1 files changed, 1 insertions, 8 deletions
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', - ], - }], ], }, ], |