diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-21 01:48:32 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-21 01:48:32 +0000 |
| commit | a0b1c513361089833a7b2ecdc5483eff0d944d60 (patch) | |
| tree | 5ac22957699f58a2feda8620a420d4ad186507d6 /webkit | |
| parent | 6d85f696f637775ef241d74b5733d477f52ccbe7 (diff) | |
| download | chromium_src-a0b1c513361089833a7b2ecdc5483eff0d944d60.zip chromium_src-a0b1c513361089833a7b2ecdc5483eff0d944d60.tar.gz chromium_src-a0b1c513361089833a7b2ecdc5483eff0d944d60.tar.bz2 | |
I managed to break test_shell. Reverting. I'll fix tomorrow.
Reverts r14075
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14080 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/webkit.gyp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index f0becb8..53326dd 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -4148,7 +4148,7 @@ ], 'sources': [ '../third_party/WebKit/WebKit/chromium/public/gtk/WebInputEventFactory.h', - '../third_party/WebKit/WebKit/chromium/public/x11/WebScreenInfoFactory.h', + '../third_party/WebKit/WebKit/chromium/public/gtk/WebScreenInfoFactory.h', '../third_party/WebKit/WebKit/chromium/public/mac/WebInputEventFactory.h', '../third_party/WebKit/WebKit/chromium/public/mac/WebScreenInfoFactory.h', '../third_party/WebKit/WebKit/chromium/public/WebCache.h', @@ -4182,7 +4182,7 @@ '../third_party/WebKit/WebKit/chromium/src/ChromiumCurrentTime.cpp', '../third_party/WebKit/WebKit/chromium/src/ChromiumThreading.cpp', '../third_party/WebKit/WebKit/chromium/src/gtk/WebInputEventFactory.cpp', - '../third_party/WebKit/WebKit/chromium/src/x11/WebScreenInfoFactory.cpp', + '../third_party/WebKit/WebKit/chromium/src/gtk/WebScreenInfoFactory.cpp', '../third_party/WebKit/WebKit/chromium/src/mac/WebInputEventFactory.mm', '../third_party/WebKit/WebKit/chromium/src/mac/WebScreenInfoFactory.mm', '../third_party/WebKit/WebKit/chromium/src/WebCache.cpp', @@ -4203,14 +4203,10 @@ '../build/linux/system.gyp:gtk', ], 'include_dirs': [ - '../third_party/WebKit/WebKit/chromium/public/x11', '../third_party/WebKit/WebKit/chromium/public/gtk', ], }, { # else: OS!="linux" - 'sources/': [ - ['exclude', '/gtk/'], - ['exclude', '/x11/'], - ], + 'sources/': [['exclude', '/gtk/']], }], ['OS=="mac"', { 'include_dirs': [ |