diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-13 21:16:00 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-13 21:16:00 +0000 |
| commit | b19f1cd7bf78c0d8cf23483d4bbf82466d93372e (patch) | |
| tree | 46d59107f0ed72492f2479b6e3a9ad45e88de9a0 /webkit | |
| parent | ede1b12edcf6744339f9286918ecb852bf3e4bb5 (diff) | |
| download | chromium_src-b19f1cd7bf78c0d8cf23483d4bbf82466d93372e.zip chromium_src-b19f1cd7bf78c0d8cf23483d4bbf82466d93372e.tar.gz chromium_src-b19f1cd7bf78c0d8cf23483d4bbf82466d93372e.tar.bz2 | |
Linux: GYP fixes
This is the fix of tweaks to the GYP files needed to build test_shell.
Review URL: http://codereview.chromium.org/42179
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11670 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gyp | 2 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp index 038fac7..56b336d 100644 --- a/webkit/tools/test_shell/test_shell.gyp +++ b/webkit/tools/test_shell/test_shell.gyp @@ -175,7 +175,7 @@ 'outputs': [ '<(PRODUCT_DIR)/test_shell.pak', ], - 'action': ['python', '../tools/data_pack/repack.py', '<@(_outputs)', '<@(_inputs)'], + 'action': ['python', '../../../tools/data_pack/repack.py', '<@(_outputs)', '<@(_inputs)'], }, ], 'scons_depends': [ diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 970a59e8..5aff133 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -2052,7 +2052,6 @@ '../third_party/WebKit/WebCore/platform/chromium/WidgetChromium.cpp', '../third_party/WebKit/WebCore/platform/chromium/WindowsVersion.cpp', '../third_party/WebKit/WebCore/platform/chromium/WindowsVersion.h', - '../third_party/WebKit/WebCore/platform/chromium/gtkdrawing.h', '../third_party/WebKit/WebCore/platform/graphics/cairo/CairoPath.h', '../third_party/WebKit/WebCore/platform/graphics/cairo/FontCairo.cpp', '../third_party/WebKit/WebCore/platform/graphics/cairo/GradientCairo.cpp', @@ -3856,6 +3855,9 @@ '../third_party/WebKit/WebCore/plugins/PluginView.cpp', '../third_party/WebKit/WebCore/plugins/npapi.cpp', + # Use LinkHashChromium.cpp instead + '../third_party/WebKit/WebCore/platform/LinkHash.cpp', + # Don't build these. # TODO(mark): I don't know exactly why these are excluded. It would # be nice to provide more explicit comments. Some of these do actually @@ -4324,7 +4326,6 @@ 'glue/simple_webmimeregistry_impl.h', 'glue/stacking_order_iterator.cc', 'glue/stacking_order_iterator.h', - 'glue/tools_proxy.h', 'glue/webclipboard_impl.cc', 'glue/webclipboard_impl.h', 'glue/webcursor.cc', |