#
{
+ 'variables': {
+ 'blink_web_output_dir': '<(SHARED_INTERMEDIATE_DIR)/blink/web',
+ },
'includes': [
'../bindings/bindings.gypi',
'../core/core.gypi',
'../wtf/wtf.gypi',
'web.gypi',
],
+ 'target_defaults': {
+ 'variables': {
+ 'clang_warning_flags': ['-Wglobal-constructors'],
+ },
+ },
'targets': [
{
- 'target_name': 'webkit',
+ 'target_name': 'blink_web',
'type': '<(component)',
'variables': { 'enable_wexit_time_destructors': 1, },
'dependencies': [
'../core/core.gyp:webcore',
'../modules/modules.gyp:modules',
'<(DEPTH)/skia/skia.gyp:skia',
- '<(angle_path)/src/build_angle.gyp:translator',
+ '<(angle_path)/src/angle.gyp:translator',
'<(DEPTH)/third_party/icu/icu.gyp:icuuc',
'<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
'<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
'<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
],
'include_dirs': [
- '../../public/web',
- '../web',
'<(angle_path)/include',
'<(DEPTH)/third_party/skia/include/utils',
],
'INSIDE_BLINK',
],
'sources': [
- '<@(webcore_platform_support_files)',
'<@(web_files)',
],
'conditions': [
'<(DEPTH)/url/url.gyp:url_lib',
'<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
],
- 'include_dirs': [
- # WARNING: Do not view this particular case as a precedent for
- # including WebCore headers in DumpRenderTree project.
- '../core/testing/v8', # for WebCoreTestSupport.h, needed to link in window.internals code.
- ],
+ 'variables': {
+ 'clang_warning_flags_unset': [
+ # FIXME: It would be nice to enable this in shared builds too,
+ # but the test files have global constructors from the GTEST macro
+ # and we pull in the test files into the blink_web target in the
+ # shared build.
+ '-Wglobal-constructors',
+ ],
+ },
'sources': [
- # Compile Blink unittest files into webkit.dll in component build mode
- # since there're methods that are tested but not exported.
- # WebUnitTests.* exports an API that runs all the unittests inside
- # webkit.dll.
+ # Compile Blink unittest files into blink_web.dll in component build mode
'<@(bindings_unittest_files)',
'<@(core_unittest_files)',
'<@(modules_unittest_files)',
- # FIXME: the next line should not be needed. We prefer to run these unit tests outside webkit.dll.
+ # FIXME: the next line should not be needed. We prefer to run these unit tests outside blink_web.dll.
'<@(platform_web_unittest_files)',
'<@(web_unittest_files)',
'WebTestingSupport.cpp',
- 'tests/WebUnitTests.cpp', # Components test runner support.
],
'conditions': [
- ['OS=="win" or OS=="mac"', {
+ ['use_openssl==0 and (OS=="win" or OS=="mac")', {
'dependencies': [
'<(DEPTH)/third_party/nss/nss.gyp:*',
],
}],
- ['clang==1', {
- # FIXME: It would be nice to enable this in shared builds too,
- # but the test files have global constructors from the GTEST macro
- # and we pull in the test files into the webkit target in the
- # shared build.
- 'cflags!': ['-Wglobal-constructors'],
- 'xcode_settings': {
- 'WARNING_CFLAGS!': ['-Wglobal-constructors'],
- },
- }],
],
'msvs_settings': {
'VCLinkerTool': {
'dependencies': [
'<(DEPTH)/build/linux/system.gyp:fontconfig',
],
- 'include_dirs': [
- '../../public/web/linux',
- ],
}, {
'sources/': [
['exclude', 'linux/'],
'dependencies': [
'<(DEPTH)/build/linux/system.gyp:x11',
],
- 'include_dirs': [
- '../../public/web/x11',
- ],
}, {
'sources/': [
['exclude', 'x11/'],
]
}],
- ['toolkit_uses_gtk == 1', {
- 'dependencies': [
- '<(DEPTH)/build/linux/system.gyp:gtk',
- ],
- 'include_dirs': [
- '../../public/web/gtk',
- ],
- }, { # else: toolkit_uses_gtk != 1
- 'sources/': [
- ['exclude', 'WebInputEventFactoryGtk.cpp$'],
- ],
- }],
- ['OS=="android"', {
- 'include_dirs': [
- '../../public/web/android',
- '../../public/web/linux', # We need linux/WebFontRendering.h on Android.
- ],
- }, { # else: OS!="android"
+ ['OS!="android"', {
'sources/': [
['exclude', 'WebInputEventFactoryAndroid.cpp$'],
],
}],
['OS=="mac"', {
- 'include_dirs': [
- '../../public/web/mac',
- ],
'link_settings': {
'libraries': [
'$(SDKROOT)/System/Library/Frameworks/Accelerate.framework',
['exclude', 'mac/WebScrollbarTheme.cpp$'],
],
}],
- ['OS=="win"', {
- 'include_dirs': [
- '../../public/web/win',
- ],
- }, { # else: OS!="win"
+ ['OS!="win"', {
'sources/': [
['exclude', 'WebInputEventFactoryWin.cpp$'],
],
}],
- ['use_default_render_theme==1', {
- 'include_dirs': [
- '../../public/web/default',
- ],
- }, { # else use_default_render_theme==0
+ ['use_default_render_theme==0', {
'sources/': [
['exclude', 'default/WebRenderTheme.cpp'],
],
],
}],
],
- 'actions': [
- {
- 'action_name': 'PickerCommon',
- 'process_outputs_as_sources': 1,
- 'variables': {
- 'resources': [
- 'resources/pickerCommon.css',
- 'resources/pickerCommon.js',
- ],
- },
- 'inputs': [
- 'scripts/make-file-arrays.py',
- '<@(resources)',
- ],
- 'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/blink/PickerCommon.h',
- '<(SHARED_INTERMEDIATE_DIR)/blink/PickerCommon.cpp',
- ],
- 'action': [
- 'python',
- 'scripts/make-file-arrays.py',
- '--out-h=<(SHARED_INTERMEDIATE_DIR)/blink/PickerCommon.h',
- '--out-cpp=<(SHARED_INTERMEDIATE_DIR)/blink/PickerCommon.cpp',
- '<@(resources)',
- ],
- },
- {
- 'action_name': 'CalendarPicker',
- 'process_outputs_as_sources': 1,
- 'variables': {
- 'resources': [
- 'resources/calendarPicker.css',
- 'resources/calendarPicker.js',
- 'resources/pickerButton.css',
- 'resources/suggestionPicker.css',
- 'resources/suggestionPicker.js',
- ],
- },
- 'inputs': [
- 'scripts/make-file-arrays.py',
- '<@(resources)'
- ],
- 'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/blink/CalendarPicker.h',
- '<(SHARED_INTERMEDIATE_DIR)/blink/CalendarPicker.cpp',
- ],
- 'action': [
- 'python',
- 'scripts/make-file-arrays.py',
- '--out-h=<(SHARED_INTERMEDIATE_DIR)/blink/CalendarPicker.h',
- '--out-cpp=<(SHARED_INTERMEDIATE_DIR)/blink/CalendarPicker.cpp',
- '<@(resources)',
- ],
- },
- {
- 'action_name': 'ColorSuggestionPicker',
- 'process_outputs_as_sources': 1,
- 'variables': {
- 'resources': [
- 'resources/colorSuggestionPicker.css',
- 'resources/colorSuggestionPicker.js',
- ],
- },
- 'inputs': [
- 'scripts/make-file-arrays.py',
- '<@(resources)',
- ],
- 'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/blink/ColorSuggestionPicker.h',
- '<(SHARED_INTERMEDIATE_DIR)/blink/ColorSuggestionPicker.cpp',
- ],
- 'action': [
- 'python',
- 'scripts/make-file-arrays.py',
- '--out-h=<(SHARED_INTERMEDIATE_DIR)/blink/ColorSuggestionPicker.h',
- '--out-cpp=<(SHARED_INTERMEDIATE_DIR)/blink/ColorSuggestionPicker.cpp',
- '<@(resources)',
- ],
- },
- ],
},
{
- 'target_name': 'webkit_test_support',
+ # GN version: //third_party/WebKit/Source/web:test_support
+ 'target_name': 'blink_web_test_support',
'conditions': [
['component=="shared_library"', {
'type': 'none',
'type': 'static_library',
'dependencies': [
'../config.gyp:config',
+ '../core/core.gyp:webcore_generated',
'../core/core.gyp:webcore_testing',
'../modules/modules.gyp:modules_testing',
'../wtf/wtf.gyp:wtf',
'<(DEPTH)/skia/skia.gyp:skia',
+ '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
],
'include_dirs': [
- '../../public/web',
- '../core/testing/v8', # for WebCoreTestSupport.h, needed to link in window.internals code.
'../../',
+ '<(SHARED_INTERMEDIATE_DIR)/blink', # gen/blink
],
'sources': [
'WebTestingSupport.cpp',
},
],
}],
- ['clang==1', {
- 'target_defaults': {
- 'cflags': ['-Wglobal-constructors'],
- 'xcode_settings': {
- 'WARNING_CFLAGS': ['-Wglobal-constructors'],
- },
- },
- }],
], # conditions
}