| Index: webkit/common/webkit_common.gyp
|
| diff --git a/webkit/common/webkit_common.gyp b/webkit/common/webkit_common.gyp
|
| index fb9bc48c80d6b646f5f24a76ae2996d9553b9a60..89a5a34478eb5c9129010e1ea602d987b690e6de 100644
|
| --- a/webkit/common/webkit_common.gyp
|
| +++ b/webkit/common/webkit_common.gyp
|
| @@ -16,53 +16,14 @@
|
| 'WEBKIT_COMMON_IMPLEMENTATION',
|
| ],
|
| 'dependencies': [
|
| - '<(DEPTH)/base/base.gyp:base',
|
| - '<(DEPTH)/base/base.gyp:base_i18n',
|
| - '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
|
| - '<(DEPTH)/net/net.gyp:net',
|
| - '<(DEPTH)/skia/skia.gyp:skia',
|
| - '<(DEPTH)/ui/base/ui_base.gyp:ui_base',
|
| - '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
|
| - '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
|
| - '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
|
| - '<(DEPTH)/url/url.gyp:url_lib',
|
| - '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
|
| - '<(DEPTH)/third_party/WebKit/public/blink_headers.gyp:blink_headers',
|
| + '../../base/base.gyp:base',
|
| + '../../url/url.gyp:url_lib',
|
| ],
|
| - 'export_dependent_settings': [
|
| - '<(DEPTH)/third_party/WebKit/public/blink_headers.gyp:blink_headers',
|
| - ],
|
| -
|
| - 'include_dirs': [
|
| - '<(INTERMEDIATE_DIR)',
|
| - '<(SHARED_INTERMEDIATE_DIR)/ui',
|
| - '<(SHARED_INTERMEDIATE_DIR)/webkit',
|
| - ],
|
| -
|
| 'sources': [
|
| 'data_element.cc',
|
| 'data_element.h',
|
| 'webkit_common_export.h',
|
| ],
|
| -
|
| - 'conditions': [
|
| - ['use_aura==1 and use_x11==1', {
|
| - 'dependencies': [
|
| - '<(DEPTH)/build/linux/system.gyp:xcursor',
|
| - ],
|
| - }],
|
| - ['OS=="mac"', {
|
| - 'link_settings': {
|
| - 'libraries': [
|
| - '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
|
| - ],
|
| - },
|
| - }],
|
| - ['OS=="win"', {
|
| - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
|
| - 'msvs_disabled_warnings': [ 4800, 4267 ],
|
| - }],
|
| - ],
|
| },
|
| ],
|
| }
|
|
|