summaryrefslogtreecommitdiffstats
path: root/webkit/webkit.gyp
diff options
context:
space:
mode:
authoramanda@chromium.org <amanda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-06 20:13:11 +0000
committeramanda@chromium.org <amanda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-06 20:13:11 +0000
commit4d9ef386a1e45a363178a92d3215664dba439a2f (patch)
treeb4a25629b3d90b9f6ede3951cc3fc1ecb21a7893 /webkit/webkit.gyp
parentad80d5e5bc4b8924778b8418058761ef0ad19aa4 (diff)
downloadchromium_src-4d9ef386a1e45a363178a92d3215664dba439a2f.zip
chromium_src-4d9ef386a1e45a363178a92d3215664dba439a2f.tar.gz
chromium_src-4d9ef386a1e45a363178a92d3215664dba439a2f.tar.bz2
Reverting 31266. threw asserts in test_shell on the bots.
Review URL: http://codereview.chromium.org/377013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31278 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/webkit.gyp')
-rw-r--r--webkit/webkit.gyp5
1 files changed, 5 insertions, 0 deletions
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 47e8de6..1fa755b 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -415,6 +415,11 @@
}],
['OS!="mac"', {
'sources/': [['exclude', '_mac\\.(cc|mm)$']]
+ }, { # else: OS=="mac"
+ 'sources!': [
+ # TODO(port): Unfork webplugin_delegate_impl_mac and this file.
+ 'glue/plugins/webplugin_delegate_impl.cc',
+ ],
}],
['OS!="win"', {
'sources/': [['exclude', '_win\\.cc$']],