diff options
| -rw-r--r-- | net/net.gyp | 3 | ||||
| -rw-r--r-- | skia/skia.gyp | 4 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gyp | 2 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 5 |
4 files changed, 9 insertions, 5 deletions
diff --git a/net/net.gyp b/net/net.gyp index dd02f9d..4432bf8 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -91,7 +91,6 @@ 'base/net_errors.h', 'base/net_module.cc', 'base/net_module.h', - 'base/net_resources.h', 'base/net_util.cc', 'base/net_util.h', 'base/net_util_posix.cc', @@ -540,7 +539,7 @@ 'rule_name': 'grit', 'extension': 'grd', 'inputs': [ - '<(DEPTH)/tools/grit/grit.py', + '../tools/grit/grit.py', ], 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/net/grit/<(RULE_INPUT_ROOT).h', diff --git a/skia/skia.gyp b/skia/skia.gyp index 62c818b..e3ceeae 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -691,6 +691,10 @@ '-Wno-unused', '-Wno-unused-function', ], + 'sources!': [ + 'ports/SkFontHost_none.cpp', + 'sgl/SkTypeface_fake.cpp', + ], }], [ 'OS == "mac"', { 'defines': [ 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', |