diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-31 23:07:49 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-31 23:07:49 +0000 |
| commit | c90e16ce1fbc9abc1a1a58766e0418263ed28a84 (patch) | |
| tree | 21f690c181e40b86dc25cdfcb7d6899c1e08b19e /webkit/webkit.gyp | |
| parent | febf851cbef583f82237843f03313752f645a12d (diff) | |
| download | chromium_src-c90e16ce1fbc9abc1a1a58766e0418263ed28a84.zip chromium_src-c90e16ce1fbc9abc1a1a58766e0418263ed28a84.tar.gz chromium_src-c90e16ce1fbc9abc1a1a58766e0418263ed28a84.tar.bz2 | |
Linux gyp changes
* ipc_tests, startup_tests and page_cycler_tests no depend on 'view'.
* Exclude WebCore/platform/network/ResourceHandle.cpp in favor of
glue/resource_handle_impl.cc.
* Tab cleanup in chrome.gyp.
Review URL: http://codereview.chromium.org/57074
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12915 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/webkit.gyp')
| -rw-r--r-- | webkit/webkit.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index b57e75a..4b66a3e 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -3951,6 +3951,8 @@ 'sources!': [ # Not yet ported to Linux. '../third_party/WebKit/WebCore/platform/graphics/chromium/FontCustomPlatformData.cpp', + # Conflicts with glue/resource_handle_impl.cc + '../third_party/WebKit/WebCore/platform/network/ResourceHandle.cpp', ], 'sources/': [ # Cherry-pick files excluded by the broader regular expressions above. |