'../build/scripts/scripts.gypi',
'../build/win/precompile.gypi',
'../modules/modules.gypi',
+ '../platform/blink_platform.gypi',
'../wtf/wtf.gypi',
'web.gypi',
],
'targets': [
{
- 'target_name': 'webkit',
+ 'target_name': 'blink_web',
'type': '<(component)',
'variables': { 'enable_wexit_time_destructors': 1, },
'dependencies': [
- 'picker_resources',
'../config.gyp:config',
'../platform/blink_platform.gyp:blink_common',
'../core/core.gyp:webcore',
'../modules/modules.gyp:modules',
'<(DEPTH)/skia/skia.gyp:skia',
- '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator',
+ '<(angle_path)/src/build_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',
- '<(DEPTH)/third_party/angle_dx11/include',
+ '<(angle_path)/include',
'<(DEPTH)/third_party/skia/include/utils',
],
'defines': [
'INSIDE_BLINK',
],
'sources': [
- '<@(webcore_platform_support_files)',
'<@(web_files)',
],
'conditions': [
['component=="shared_library"', {
'dependencies': [
- '../core/core.gyp:webcore_derived',
- '../core/core.gyp:webcore_test_support',
- '../modules/modules.gyp:modules_test_support',
+ '../core/core.gyp:webcore_generated',
+ '../core/core.gyp:webcore_testing',
+ '../modules/modules.gyp:modules_testing',
+ '../wtf/wtf_tests.gyp:wtf_unittest_helpers',
'<(DEPTH)/base/base.gyp:test_support_base',
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
- '<(DEPTH)/third_party/icu/icu.gyp:*',
- '<(libjpeg_gyp_path):libjpeg',
+ '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+ '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
'<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
'<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp',
'<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
'<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
'<(DEPTH)/url/url.gyp:url_lib',
'<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
+ '<(libjpeg_gyp_path):libjpeg',
# We must not add webkit_support here because of cyclic dependency.
],
'export_dependent_settings': [
'<(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.
- ],
'sources': [
- # Compile Blink unittest files into webkit.dll in component build mode
+ # Compile Blink unittest files into blink_web.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.
+ # blink_web.dll.
'<@(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 blink_web.dll.
+ '<@(platform_web_unittest_files)',
'<@(web_unittest_files)',
'WebTestingSupport.cpp',
'tests/WebUnitTests.cpp', # Components test runner support.
['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
+ # and we pull in the test files into the blink_web target in the
# shared build.
'cflags!': ['-Wglobal-constructors'],
'xcode_settings': {
'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',
}, { # else: OS!="mac"
'sources/': [
['exclude', 'WebInputEventFactoryMac.mm$'],
+ ['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'],
],
['OS=="android"', {
'sources/': [
['include', '^linux/WebFontRendering\\.cpp$'],
- ['include', '^linux/WebFontRenderStyle\\.cpp$'],
],
}],
],
- },
- {
- 'target_name': 'webkit_test_support',
- 'conditions': [
- ['component=="shared_library"', {
- 'type': 'none',
- }, {
- 'type': 'static_library',
- 'dependencies': [
- '../config.gyp:config',
- '../core/core.gyp:webcore_test_support',
- '../modules/modules.gyp:modules_test_support',
- '../wtf/wtf.gyp:wtf',
- '<(DEPTH)/skia/skia.gyp:skia',
- ],
- 'include_dirs': [
- '../../public/web',
- '../core/testing/v8', # for WebCoreTestSupport.h, needed to link in window.internals code.
- '../../',
- ],
- 'sources': [
- 'WebTestingSupport.cpp',
- ],
- }],
- ],
- },
- {
- 'target_name': 'picker_resources',
- 'type': 'none',
- 'hard_dependency': 1,
- 'variables': {
- 'make_file_arrays': 'scripts/make-file-arrays.py',
- },
'actions': [
{
'action_name': 'PickerCommon',
+ 'process_outputs_as_sources': 1,
'variables': {
'resources': [
'resources/pickerCommon.css',
],
},
'inputs': [
- '<(make_file_arrays)',
+ 'scripts/make-file-arrays.py',
'<@(resources)',
],
'outputs': [
],
'action': [
'python',
- '<(make_file_arrays)',
+ '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',
],
},
'inputs': [
- '<(make_file_arrays)',
+ 'scripts/make-file-arrays.py',
'<@(resources)'
],
'outputs': [
],
'action': [
'python',
- '<(make_file_arrays)',
- '--condition=ENABLE(CALENDAR_PICKER)',
+ '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',
],
},
'inputs': [
- '<(make_file_arrays)',
+ 'scripts/make-file-arrays.py',
'<@(resources)',
],
'outputs': [
],
'action': [
'python',
- '<(make_file_arrays)',
+ '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',
+ 'conditions': [
+ ['component=="shared_library"', {
+ 'type': 'none',
+ }, {
+ 'type': 'static_library',
+ 'dependencies': [
+ '../config.gyp:config',
+ '../core/core.gyp:webcore_testing',
+ '../modules/modules.gyp:modules_testing',
+ '../wtf/wtf.gyp:wtf',
+ '<(DEPTH)/skia/skia.gyp:skia',
+ ],
+ 'include_dirs': [
+ '../../',
+ ],
+ 'sources': [
+ 'WebTestingSupport.cpp',
+ ],
+ }],
+ ],
+ },
], # targets
'conditions': [
['gcc_version>=46', {
projects / platform / framework / web / crosswalk.git / blobdiff