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

Unified Diff: third_party/WebKit/Source/web/web.gyp

Issue 1676083002: Extract webkit_unit_tests from blink_web component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Win dbg non-oilpan fix: make TextFinder non-copyable Created 4 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 | « third_party/WebKit/Source/web/WebViewImpl.h ('k') | third_party/WebKit/Source/web/web.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/web.gyp
diff --git a/third_party/WebKit/Source/web/web.gyp b/third_party/WebKit/Source/web/web.gyp
index cbf47cb9de6c314bd9747042b4b9e0528e6bcb93..a692433cfa7d1af6e0b192520fdbe8f47045782c 100644
--- a/third_party/WebKit/Source/web/web.gyp
+++ b/third_party/WebKit/Source/web/web.gyp
@@ -57,6 +57,7 @@
'../config.gyp:config',
'../platform/blink_platform.gyp:blink_common',
'../modules/modules.gyp:modules',
+ '<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/cc/cc.gyp:cc',
'<(DEPTH)/skia/skia.gyp:skia',
'<(angle_path)/src/angle.gyp:translator',
@@ -76,6 +77,7 @@
'<(DEPTH)/third_party/skia/include/utils',
],
'defines': [
+ 'BLINK_WEB_IMPLEMENTATION=1',
'BLINK_IMPLEMENTATION=1',
'INSIDE_BLINK',
],
@@ -86,16 +88,10 @@
['component=="shared_library"', {
'dependencies': [
'../core/core.gyp:webcore_shared',
- '../core/core.gyp:webcore_testing',
- '../modules/modules.gyp:modules_testing',
'../platform/blink_platform.gyp:blink_common',
'../platform/blink_platform.gyp:blink_platform',
- '../platform/blink_platform_tests.gyp:blink_platform_test_support',
'../wtf/wtf.gyp:wtf',
'../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:icuuc',
'<(DEPTH)/third_party/icu/icu.gyp:icui18n',
'<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
@@ -111,25 +107,6 @@
'<(DEPTH)/url/url.gyp:url_lib',
'<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
],
- '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 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 blink_web.dll.
- '<@(platform_web_unittest_files)',
- '<@(web_unittest_files)',
- 'WebTestingSupport.cpp',
- ],
'msvs_settings': {
'VCLinkerTool': {
'conditions': [
@@ -197,26 +174,31 @@
{
# GN version: //third_party/WebKit/Source/web:test_support
'target_name': 'blink_web_test_support',
+ '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',
+ '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
+ ],
+ 'include_dirs': [
+ '../../',
+ '<(SHARED_INTERMEDIATE_DIR)/blink', # gen/blink
+ ],
+ 'sources': [
+ 'WebTestingSupport.cpp',
+ ],
'conditions': [
- ['component=="shared_library"', {
- 'type': 'none',
- }, {
- 'type': 'static_library',
+ ['component!="shared_library"', {
'dependencies': [
- '../config.gyp:config',
+ '../core/core.gyp:webcore',
'../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': [
- '../../',
- '<(SHARED_INTERMEDIATE_DIR)/blink', # gen/blink
],
- 'sources': [
- 'WebTestingSupport.cpp',
+ }, {
+ 'dependencies': [
+ '../core/core.gyp:webcore_shared',
],
}],
],
« no previous file with comments | « third_party/WebKit/Source/web/WebViewImpl.h ('k') | third_party/WebKit/Source/web/web.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698