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

Unified Diff: Source/modules/modules.gyp

Issue 907303002: Added behind link_core_modules_separately flag to gyp files. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Moved link_core_modules_separetely to features.gypi Created 5 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 | « Source/core/core_generated.gypi ('k') | Source/web/web.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/modules.gyp
diff --git a/Source/modules/modules.gyp b/Source/modules/modules.gyp
index 7740fc6f50bff6ddaa96ebbc01ee66afecbe1f18..188316370a974244b783ac1d7cd4dba86b27cf0c 100644
--- a/Source/modules/modules.gyp
+++ b/Source/modules/modules.gyp
@@ -29,6 +29,7 @@
#
{
'includes': [
+ '../build/features.gypi',
'../build/scripts/scripts.gypi',
'../build/win/precompile.gypi',
'../bindings/modules/modules.gypi', # modules can depend on bindings/modules, but not on bindings
@@ -37,12 +38,10 @@
'targets': [{
# GN version: //third_party/WebKit/Source/modules:modules
'target_name': 'modules',
- 'type': 'static_library',
'dependencies': [
'<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
'<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
'../config.gyp:config',
- '../core/core.gyp:webcore',
'modules_generated.gyp:make_modules_generated',
],
'defines': [
@@ -57,6 +56,33 @@
'<@(bindings_modules_v8_generated_union_type_files)',
'<(bindings_modules_v8_output_dir)/initPartialInterfacesInModules.cpp',
],
+ 'conditions': [
+ ['component=="shared_library" and link_core_modules_separately==1', {
+ 'type': 'shared_library',
+ 'defines': [
+ 'BLINK_MODULES_IMPLEMENTATION=1',
+ ],
+ 'dependencies': [
+ '../core/core.gyp:webcore_shared', # modules depends on core.
+ '../platform/blink_platform.gyp:blink_common',
+ '../platform/blink_platform.gyp:blink_platform',
+ '../wtf/wtf.gyp:wtf',
+ '<(DEPTH)/url/url.gyp:url_lib',
+ '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
+ ],
+ 'sources': [
+ '<@(modules_testing_files)',
+ '<(bindings_modules_v8_output_dir)/V8InternalsPartial.cpp',
+ '<(bindings_modules_v8_output_dir)/V8InternalsPartial.h',
+ ],
+ }, {
+ 'type': 'static_library',
+ 'dependencies': [
+ 'modules_testing',
+ '../core/core.gyp:webcore',
+ ],
+ }]
+ ],
# Disable c4267 warnings until we fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, 4334, ]
},
« no previous file with comments | « Source/core/core_generated.gypi ('k') | Source/web/web.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698