Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(165)

Unified Diff: webkit/webkit.gyp

Issue 39219: test_shell and test_shell_tests on Linux from gyp-generated scons files: (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/tools/test_shell/test_shell.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/webkit.gyp
===================================================================
--- webkit/webkit.gyp (revision 11127)
+++ webkit/webkit.gyp (working copy)
@@ -349,6 +349,12 @@
'<(SHARED_INTERMEDIATE_DIR)/webkit',
],
}],
+ ['OS=="linux"', {
+ 'defines': ['WTF_USE_PTHREADS=1'],
+ 'direct_dependent_settings': {
+ 'defines': ['WTF_USE_PTHREADS=1'],
+ },
+ }],
],
},
{
@@ -1068,8 +1074,8 @@
'port/bindings/v8/v8_nodefilter.h',
'port/bindings/v8/V8NPUtils.cpp',
'port/bindings/v8/V8NPUtils.h',
- 'port/bindings/v8/V8NPobject.cpp',
- 'port/bindings/v8/V8NPobject.h',
+ 'port/bindings/v8/V8NPObject.cpp',
+ 'port/bindings/v8/V8NPObject.h',
'port/bindings/v8/v8_proxy.cpp',
'port/bindings/v8/v8_proxy.h',
'port/bindings/v8/v8_utility.h',
@@ -3175,8 +3181,8 @@
'../third_party/WebKit/WebCore/rendering/RenderTextFragment.h',
'../third_party/WebKit/WebCore/rendering/RenderTheme.cpp',
'../third_party/WebKit/WebCore/rendering/RenderTheme.h',
- '../third_party/WebKit/WebCore/rendering/RenderThemeChromiumGtk.cpp',
- '../third_party/WebKit/WebCore/rendering/RenderThemeChromiumGtk.h',
+ '../third_party/WebKit/WebCore/rendering/RenderThemeChromiumLinux.cpp',
+ '../third_party/WebKit/WebCore/rendering/RenderThemeChromiumLinux.h',
'../third_party/WebKit/WebCore/rendering/RenderThemeChromiumMac.h',
'../third_party/WebKit/WebCore/rendering/RenderThemeChromiumMac.mm',
'../third_party/WebKit/WebCore/rendering/RenderThemeChromiumWin.cpp',
@@ -3913,13 +3919,21 @@
# Not yet ported to Linux.
'../third_party/WebKit/WebCore/platform/graphics/chromium/FontCustomPlatformData.cpp',
],
- 'defines': ['WTF_USE_PTHREADS=1'],
+ 'sources/': [
+ # Cherry-pick files excluded by the broader regular expressions above.
+ ['include', 'third_party/WebKit/WebCore/platform/chromium/KeyCodeConversionGtk\\.cpp$'],
+ ['include', 'third_party/WebKit/WebCore/platform/graphics/chromium/FontCacheLinux\\.cpp$'],
+ ['include', 'third_party/WebKit/WebCore/platform/graphics/chromium/FontLinux\\.cpp$'],
+ ['include', 'third_party/WebKit/WebCore/platform/graphics/chromium/FontPlatformDataLinux\\.cpp$'],
+ ['include', 'third_party/WebKit/WebCore/platform/graphics/chromium/GlyphPageTreeNodeLinux\\.cpp$'],
+ ['include', 'third_party/WebKit/WebCore/platform/graphics/chromium/SimpleFontDataLinux\\.cpp$'],
+ ],
# for:
# .../WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp
'cflags': ['-Wno-multichar'],
- # TODO(sgk): unnecessary once common.gypi gets Linux settings
- # necessary to avoid build failure due to warnings generated by:
- # ../third_party/WebKit/WebCore/dom/Document.cpp
+ # TODO(sgk): unnecessary once common.gypi gets Linux settings
+ # necessary to avoid build failure due to warnings generated by:
+ # ../third_party/WebKit/WebCore/dom/Document.cpp
'scons_remove' : {'CXXFLAGS' : ['-Werror']},
}],
['OS=="mac"', {
@@ -4289,6 +4303,8 @@
'glue/webinputevent.h',
'glue/webinputevent_linux.cc',
'glue/webinputevent_mac.mm',
+ 'glue/webinputevent_util.cc',
+ 'glue/webinputevent_util.h',
'glue/webinputevent_win.cc',
'glue/webkit_glue.cc',
'glue/webkit_glue.h',
@@ -4338,8 +4354,12 @@
'webcore',
],
'conditions': [
- ['OS!="linux"', {
- 'sources/': [['exclude', '_(linux|gtk)(_data)?\\.cc$']]
+ ['OS=="linux"', {
+ 'sources!': [
+ 'glue/plugins/plugin_stubs.cc',
+ ],
+ }, { # else: OS!="linux"
+ 'sources/': [['exclude', '_(linux|gtk)(_data)?\\.cc$']],
}],
['OS!="mac"', {
'sources/': [['exclude', '_mac\\.(cc|mm)$']]
« no previous file with comments | « webkit/tools/test_shell/test_shell.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698