| OLD | NEW |
| 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'feature_defines': [ | 7 'feature_defines': [ |
| 8 'ENABLE_DATABASE=1', | 8 'ENABLE_DATABASE=1', |
| 9 'ENABLE_DASHBOARD_SUPPORT=0', | 9 'ENABLE_DASHBOARD_SUPPORT=0', |
| 10 'ENABLE_JAVASCRIPT_DEBUGGER=0', | 10 'ENABLE_JAVASCRIPT_DEBUGGER=0', |
| (...skipping 3924 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3935 4138, 4244, 4291, 4305, 4344, 4355, 4521, 4099, | 3935 4138, 4244, 4291, 4305, 4344, 4355, 4521, 4099, |
| 3936 ], | 3936 ], |
| 3937 'xcode_settings': { | 3937 'xcode_settings': { |
| 3938 # Some Mac-specific parts of WebKit won't compile without having this | 3938 # Some Mac-specific parts of WebKit won't compile without having this |
| 3939 # prefix header injected. | 3939 # prefix header injected. |
| 3940 # TODO(mark): make this a first-class setting. | 3940 # TODO(mark): make this a first-class setting. |
| 3941 'GCC_PREFIX_HEADER': '../third_party/WebKit/WebCore/WebCorePrefix.h', | 3941 'GCC_PREFIX_HEADER': '../third_party/WebKit/WebCore/WebCorePrefix.h', |
| 3942 }, | 3942 }, |
| 3943 'conditions': [ | 3943 'conditions': [ |
| 3944 ['OS=="linux"', { | 3944 ['OS=="linux"', { |
| 3945 'dependencies': [ |
| 3946 '../build/linux/system.gyp:gtk', |
| 3947 ], |
| 3945 'sources!': [ | 3948 'sources!': [ |
| 3946 # Not yet ported to Linux. | 3949 # Not yet ported to Linux. |
| 3947 '../third_party/WebKit/WebCore/platform/graphics/chromium/FontCustom
PlatformData.cpp', | 3950 '../third_party/WebKit/WebCore/platform/graphics/chromium/FontCustom
PlatformData.cpp', |
| 3948 ], | 3951 ], |
| 3949 'sources/': [ | 3952 'sources/': [ |
| 3950 # Cherry-pick files excluded by the broader regular expressions abov
e. | 3953 # Cherry-pick files excluded by the broader regular expressions abov
e. |
| 3951 ['include', 'third_party/WebKit/WebCore/platform/chromium/KeyCodeCon
versionGtk\\.cpp$'], | 3954 ['include', 'third_party/WebKit/WebCore/platform/chromium/KeyCodeCon
versionGtk\\.cpp$'], |
| 3952 ['include', 'third_party/WebKit/WebCore/platform/graphics/chromium/F
ontCacheLinux\\.cpp$'], | 3955 ['include', 'third_party/WebKit/WebCore/platform/graphics/chromium/F
ontCacheLinux\\.cpp$'], |
| 3953 ['include', 'third_party/WebKit/WebCore/platform/graphics/chromium/F
ontLinux\\.cpp$'], | 3956 ['include', 'third_party/WebKit/WebCore/platform/graphics/chromium/F
ontLinux\\.cpp$'], |
| 3954 ['include', 'third_party/WebKit/WebCore/platform/graphics/chromium/F
ontPlatformDataLinux\\.cpp$'], | 3957 ['include', 'third_party/WebKit/WebCore/platform/graphics/chromium/F
ontPlatformDataLinux\\.cpp$'], |
| 3955 ['include', 'third_party/WebKit/WebCore/platform/graphics/chromium/G
lyphPageTreeNodeLinux\\.cpp$'], | 3958 ['include', 'third_party/WebKit/WebCore/platform/graphics/chromium/G
lyphPageTreeNodeLinux\\.cpp$'], |
| 3956 ['include', 'third_party/WebKit/WebCore/platform/graphics/chromium/S
impleFontDataLinux\\.cpp$'], | 3959 ['include', 'third_party/WebKit/WebCore/platform/graphics/chromium/S
impleFontDataLinux\\.cpp$'], |
| 3957 ], | 3960 ], |
| 3958 # for: | 3961 'cflags': [ |
| 3959 # .../WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp | 3962 # -Wno-multichar for: |
| 3960 'cflags': ['-Wno-multichar'], | 3963 # .../WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp |
| 3964 '-Wno-multichar', |
| 3965 ], |
| 3961 # TODO(sgk): unnecessary once common.gypi gets Linux settings | 3966 # TODO(sgk): unnecessary once common.gypi gets Linux settings |
| 3962 # necessary to avoid build failure due to warnings generated by: | 3967 # necessary to avoid build failure due to warnings generated by: |
| 3963 # ../third_party/WebKit/WebCore/dom/Document.cpp | 3968 # ../third_party/WebKit/WebCore/dom/Document.cpp |
| 3964 'scons_remove' : {'CXXFLAGS' : ['-Werror']}, | 3969 'scons_remove' : {'CXXFLAGS' : ['-Werror']}, |
| 3965 }], | 3970 }], |
| 3966 ['OS=="mac"', { | 3971 ['OS=="mac"', { |
| 3967 'actions': [ | 3972 'actions': [ |
| 3968 { | 3973 { |
| 3969 # Allow framework-style #include of | 3974 # Allow framework-style #include of |
| 3970 # <WebCore/WebCoreSystemInterface.h>. | 3975 # <WebCore/WebCoreSystemInterface.h>. |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4112 '../third_party/WebKit/WebKit/chromium/src/ChromiumCurrentTime.cpp', | 4117 '../third_party/WebKit/WebKit/chromium/src/ChromiumCurrentTime.cpp', |
| 4113 '../third_party/WebKit/WebKit/chromium/src/ChromiumThreading.cpp', | 4118 '../third_party/WebKit/WebKit/chromium/src/ChromiumThreading.cpp', |
| 4114 '../third_party/WebKit/WebKit/chromium/src/WebCache.cpp', | 4119 '../third_party/WebKit/WebKit/chromium/src/WebCache.cpp', |
| 4115 '../third_party/WebKit/WebKit/chromium/src/WebCString.cpp', | 4120 '../third_party/WebKit/WebKit/chromium/src/WebCString.cpp', |
| 4116 '../third_party/WebKit/WebKit/chromium/src/WebImageSkia.cpp', | 4121 '../third_party/WebKit/WebKit/chromium/src/WebImageSkia.cpp', |
| 4117 '../third_party/WebKit/WebKit/chromium/src/WebKit.cpp', | 4122 '../third_party/WebKit/WebKit/chromium/src/WebKit.cpp', |
| 4118 '../third_party/WebKit/WebKit/chromium/src/WebString.cpp', | 4123 '../third_party/WebKit/WebKit/chromium/src/WebString.cpp', |
| 4119 '../third_party/WebKit/WebKit/chromium/src/WebURL.cpp', | 4124 '../third_party/WebKit/WebKit/chromium/src/WebURL.cpp', |
| 4120 ], | 4125 ], |
| 4121 'conditions': [ | 4126 'conditions': [ |
| 4127 ['OS=="linux"', { |
| 4128 'dependencies': [ |
| 4129 '../build/linux/system.gyp:gtk', |
| 4130 ], |
| 4131 }], |
| 4122 ['OS=="mac"', { | 4132 ['OS=="mac"', { |
| 4123 'sources!': [ | 4133 'sources!': [ |
| 4124 '../third_party/WebKit/WebKit/chromium/src/WebImageSkia.cpp', | 4134 '../third_party/WebKit/WebKit/chromium/src/WebImageSkia.cpp', |
| 4125 ], | 4135 ], |
| 4126 }], | 4136 }], |
| 4127 ['OS=="win"', { | 4137 ['OS=="win"', { |
| 4128 'sources': [ | 4138 'sources': [ |
| 4129 '../third_party/WebKit/WebKit/chromium/public/win/WebSandboxSupport.
h', | 4139 '../third_party/WebKit/WebKit/chromium/public/win/WebSandboxSupport.
h', |
| 4130 '../third_party/WebKit/WebKit/chromium/public/win/WebThemeEngine.h', | 4140 '../third_party/WebKit/WebKit/chromium/public/win/WebThemeEngine.h', |
| 4131 ], | 4141 ], |
| (...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4404 ], | 4414 ], |
| 4405 # When glue is a dependency, it needs to be a hard dependency. | 4415 # When glue is a dependency, it needs to be a hard dependency. |
| 4406 # Dependents may rely on files generated by this target or one of its | 4416 # Dependents may rely on files generated by this target or one of its |
| 4407 # own hard dependencies. | 4417 # own hard dependencies. |
| 4408 'hard_dependency': 1, | 4418 'hard_dependency': 1, |
| 4409 'export_dependent_settings': [ | 4419 'export_dependent_settings': [ |
| 4410 'webcore', | 4420 'webcore', |
| 4411 ], | 4421 ], |
| 4412 'conditions': [ | 4422 'conditions': [ |
| 4413 ['OS=="linux"', { | 4423 ['OS=="linux"', { |
| 4424 'dependencies': [ |
| 4425 '../build/linux/system.gyp:gtk', |
| 4426 '../build/linux/system.gyp:pangoft2', |
| 4427 ], |
| 4414 'sources!': [ | 4428 'sources!': [ |
| 4415 'glue/plugins/plugin_stubs.cc', | 4429 'glue/plugins/plugin_stubs.cc', |
| 4416 ], | 4430 ], |
| 4417 }, { # else: OS!="linux" | 4431 }, { # else: OS!="linux" |
| 4418 'sources/': [['exclude', '_(linux|gtk)(_data)?\\.cc$']], | 4432 'sources/': [['exclude', '_(linux|gtk)(_data)?\\.cc$']], |
| 4419 }], | 4433 }], |
| 4420 ['OS!="mac"', { | 4434 ['OS!="mac"', { |
| 4421 'sources/': [['exclude', '_mac\\.(cc|mm)$']] | 4435 'sources/': [['exclude', '_mac\\.(cc|mm)$']] |
| 4422 }], | 4436 }], |
| 4423 ['OS!="win"', { | 4437 ['OS!="win"', { |
| (...skipping 21 matching lines...) Expand all Loading... |
| 4445 'default_plugin/default_plugin.gyp:default_plugin', | 4459 'default_plugin/default_plugin.gyp:default_plugin', |
| 4446 ], | 4460 ], |
| 4447 'sources!': [ | 4461 'sources!': [ |
| 4448 'glue/plugins/plugin_stubs.cc', | 4462 'glue/plugins/plugin_stubs.cc', |
| 4449 ], | 4463 ], |
| 4450 }], | 4464 }], |
| 4451 ], | 4465 ], |
| 4452 }, | 4466 }, |
| 4453 ], | 4467 ], |
| 4454 } | 4468 } |
| OLD | NEW |