Skip to content

GitLab

T
tangled
Commit f0e2c50e authored by mark@chromium.org's avatar mark@chromium.org
Browse files
Options

Add webkit.gyp:webkit target. 

Review URL: http://codereview.chromium.org/27196

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10451 0039d316-1c4b-4281-b951-d872f2087c98
parent d1587ac0
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 22 deletions
chrome/chrome.gyp
View file @ f0e2c50e
......@@ -1216,6 +1216,7 @@
'../third_party/icu38/icu38.gyp:icuuc',
'../third_party/npapi/npapi.gyp:npapi',
'../webkit/webkit.gyp:glue',
'../webkit/webkit.gyp:webkit',
],
'include_dirs': [
'..',
......
webkit/tools/test_shell/test_shell.gyp
View file @ f0e2c50e
......@@ -13,6 +13,14 @@
{
'target_name': 'test_shell_common',
'type': 'static_library',
'dependencies': [
'../../../base/base.gyp:base',
'../../../base/base.gyp:base_gfx',
'../../../testing/gtest.gyp:gtest',
'../../../skia/skia.gyp:skia',
'../../../third_party/npapi/npapi.gyp:npapi',
'../../webkit.gyp:glue',
],
'sources': [
'mac/DumpRenderTreePasteboard.h',
'mac/DumpRenderTreePasteboard.m',
......@@ -63,14 +71,6 @@
'webwidget_host_gtk.cc',
'webwidget_host_win.cc',
],
'dependencies': [
'../../../base/base.gyp:base',
'../../../base/base.gyp:base_gfx',
'../../../testing/gtest.gyp:gtest',
'../../../skia/skia.gyp:skia',
'../../../third_party/npapi/npapi.gyp:npapi',
'../../webkit.gyp:glue',
],
'conditions': [
['OS!="linux"', {'sources/': [['exclude', '_gtk\\.cc$']]}],
['OS!="mac"', {
......@@ -98,6 +98,13 @@
{
'target_name': 'test_shell',
'type': 'application',
'dependencies': [
'test_shell_common',
'../../../base/base.gyp:base',
'../../../net/net.gyp:net',
'../../webkit.gyp:glue',
'../../webkit.gyp:webkit',
],
'sources': [
'test_shell_main.cc',
],
......@@ -115,12 +122,6 @@
# the file to a source group.
'mac/Info.plist',
],
'dependencies': [
'test_shell_common',
'../../../base/base.gyp:base',
'../../../net/net.gyp:net',
'../../webkit.gyp:glue',
],
'xcode_settings': {
'INFOPLIST_FILE': 'mac/Info.plist',
},
......@@ -131,6 +132,14 @@
{
'target_name': 'test_shell_tests',
'type': 'executable',
'dependencies': [
'test_shell_common',
'../../../base/base.gyp:base',
'../../../net/net.gyp:net',
'../../../skia/skia.gyp:skia',
'../../../testing/gtest.gyp:gtest',
'../../webkit.gyp:glue',
],
'sources': [
'../../../skia/ext/convolver_unittest.cc',
'../../../skia/ext/platform_canvas_unittest.cc',
......@@ -167,14 +176,6 @@
'test_shell_test.h',
'text_input_controller_unittest.cc',
],
'dependencies': [
'test_shell_common',
'../../../base/base.gyp:base',
'../../../net/net.gyp:net',
'../../../skia/skia.gyp:skia',
'../../../testing/gtest.gyp:gtest',
'../../webkit.gyp:glue',
],
'conditions': [
['OS=="win"', {
'msvs_disabled_warnings': [ 4800 ],
......
webkit/webkit.gyp
View file @ f0e2c50e
......@@ -3193,6 +3193,8 @@
'../third_party/WebKit/WebCore/rendering/TableLayout.h',
'../third_party/WebKit/WebCore/rendering/TextControlInnerElements.cpp',
'../third_party/WebKit/WebCore/rendering/TextControlInnerElements.h',
'../third_party/WebKit/WebCore/rendering/TransformState.cpp',
'../third_party/WebKit/WebCore/rendering/TransformState.h',
'../third_party/WebKit/WebCore/rendering/bidi.cpp',
'../third_party/WebKit/WebCore/rendering/bidi.h',
'../third_party/WebKit/WebCore/rendering/break_lines.cpp',
......@@ -4018,11 +4020,66 @@
]}],
],
},
{
'target_name': 'webkit',
'type': 'static_library',
'dependencies': [
'webcore',
],
'include_dirs': [
'../third_party/WebKit/WebKit/chromium/public',
],
'defines': [
'WEBKIT_IMPLEMENTATION',
],
'sources': [
'../third_party/WebKit/WebKit/chromium/public/WebCString.h',
'../third_party/WebKit/WebKit/chromium/public/WebClipboard.h',
'../third_party/WebKit/WebKit/chromium/public/WebCommon.h',
'../third_party/WebKit/WebKit/chromium/public/WebImage.h',
'../third_party/WebKit/WebKit/chromium/public/WebKit.h',
'../third_party/WebKit/WebKit/chromium/public/WebKitClient.h',
'../third_party/WebKit/WebKit/chromium/public/WebPoint.h',
'../third_party/WebKit/WebKit/chromium/public/WebRect.h',
'../third_party/WebKit/WebKit/chromium/public/WebSize.h',
'../third_party/WebKit/WebKit/chromium/public/WebString.h',
'../third_party/WebKit/WebKit/chromium/public/WebURL.h',
'../third_party/WebKit/WebKit/chromium/src/ChromiumBridge.cpp',
'../third_party/WebKit/WebKit/chromium/src/WebCString.cpp',
'../third_party/WebKit/WebKit/chromium/src/WebImageSkia.cpp',
'../third_party/WebKit/WebKit/chromium/src/WebKit.cpp',
'../third_party/WebKit/WebKit/chromium/src/WebKitPrivate.h',
'../third_party/WebKit/WebKit/chromium/src/WebString.cpp',
'../third_party/WebKit/WebKit/chromium/src/WebURL.cpp',
],
'direct_dependent_settings': {
'include_dirs': [
'../third_party/WebKit/WebKit/chromium/public',
],
},
'conditions': [
['OS=="mac"', {
'sources!': [
'../third_party/WebKit/WebKit/chromium/src/WebImageSkia.cpp',
],
}, { # else: OS!="mac"
'defines': [
'WEBKIT_USING_SKIA',
],
'direct_dependent_settings': {
'defines': [
'WEBKIT_USING_SKIA',
],
},
}],
],
},
{
'target_name': 'glue',
'type': 'static_library',
'dependencies': [
'webcore',
'webkit',
'../net/net.gyp:net',
],
'actions': [
......@@ -4179,6 +4236,8 @@
'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',
'glue/webcursor.h',
'glue/webcursor_gtk.cc',
......@@ -4207,6 +4266,8 @@
'glue/webinputevent_linux.cc',
'glue/webinputevent_mac.mm',
'glue/webinputevent_win.cc',
'glue/webkit_client_impl.cc',
'glue/webkit_client_impl.h',
'glue/webkit_glue.cc',
'glue/webkit_glue.h',
'glue/webkit_glue_gtk.cc',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment