Index: Source/web/web.gyp |
diff --git a/Source/web/web.gyp b/Source/web/web.gyp |
index 89fa73c091d1358d0777c4682464468a2592eedf..eca2a591ca6fe40c69ef591fe0add4b35da77ae4 100644 |
--- a/Source/web/web.gyp |
+++ b/Source/web/web.gyp |
@@ -56,6 +56,7 @@ |
'dependencies': [ |
'../config.gyp:config', |
'../platform/blink_platform.gyp:blink_common', |
+ '../core/core.gyp:webcore', |
'../modules/modules.gyp:modules', |
'<(DEPTH)/skia/skia.gyp:skia', |
'<(angle_path)/src/angle.gyp:translator', |
@@ -83,6 +84,9 @@ |
'conditions': [ |
['component=="shared_library"', { |
'dependencies': [ |
+ '../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', |
@@ -91,6 +95,8 @@ |
'<(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/libxslt/libxslt.gyp:libxslt', |
'<(DEPTH)/third_party/modp_b64/modp_b64.gyp:modp_b64', |
'<(DEPTH)/third_party/ots/ots.gyp:ots', |
'<(DEPTH)/third_party/zlib/zlib.gyp:zlib', |
@@ -128,25 +134,6 @@ |
'<(DEPTH)/third_party/nss/nss.gyp:*', |
], |
}], |
- ['link_core_modules_separately==1', { |
- 'dependencies': [ |
- # webcore_shared has dependencies: |
- # webcore_generated and webcore_testing. |
- # So no need to add webcore_testing here. |
- '../core/core.gyp:webcore_shared', |
- '../platform/blink_platform.gyp:blink_common', |
- '../platform/blink_platform.gyp:blink_platform', |
- '../wtf/wtf.gyp:wtf', |
- ], |
- }, { |
- 'dependencies': [ |
- '../core/core.gyp:webcore', |
- '../core/core.gyp:webcore_testing', |
- '../modules/modules.gyp:modules_testing', |
- '<(DEPTH)/third_party/libxml/libxml.gyp:libxml', |
- '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt', |
- ], |
- }] |
], |
'msvs_settings': { |
'VCLinkerTool': { |
@@ -157,13 +144,6 @@ |
], |
}, |
}, |
- }, { |
- # component=="static_library" |
- 'dependencies': [ |
- # webcore has dependencies: webcore_generated and |
- # webcore_testing. |
- '../core/core.gyp:webcore', |
- ], |
}], |
['OS == "linux"', { |
'dependencies': [ |
@@ -235,6 +215,7 @@ |
'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', |