Index: Source/core/core.gyp |
diff --git a/Source/core/core.gyp b/Source/core/core.gyp |
index ef6e8f7953b3143ec3d2090a86a6789cedb39c71..e284601b55fdfe8fc16bb0424d7ffef7dbbd5473 100644 |
--- a/Source/core/core.gyp |
+++ b/Source/core/core.gyp |
@@ -203,80 +203,7 @@ |
'<@(bindings_core_v8_generated_aggregate_files)', |
'<@(bindings_core_v8_generated_union_type_files)', |
- # Additional .cpp files for HashTools.h |
- '<(blink_core_output_dir)/CSSPropertyNames.cpp', |
- '<(blink_core_output_dir)/CSSValueKeywords.cpp', |
- |
- # Additional .cpp files from make_core_generated actions. |
- '<(blink_core_output_dir)/Event.cpp', |
- '<(blink_core_output_dir)/EventHeaders.h', |
- '<(blink_core_output_dir)/EventNames.cpp', |
- '<(blink_core_output_dir)/EventNames.h', |
- '<(blink_core_output_dir)/EventTargetNames.cpp', |
- '<(blink_core_output_dir)/EventTargetNames.h', |
- '<(blink_core_output_dir)/EventTypeNames.cpp', |
- '<(blink_core_output_dir)/EventTypeNames.h', |
- '<(blink_core_output_dir)/FetchInitiatorTypeNames.cpp', |
- '<(blink_core_output_dir)/HTMLElementFactory.cpp', |
- '<(blink_core_output_dir)/HTMLElementFactory.h', |
- '<(blink_core_output_dir)/HTMLElementLookupTrie.cpp', |
- '<(blink_core_output_dir)/HTMLElementLookupTrie.h', |
- '<(blink_core_output_dir)/HTMLNames.cpp', |
- '<(blink_core_output_dir)/HTMLTokenizerNames.cpp', |
- '<(blink_core_output_dir)/InputTypeNames.cpp', |
- '<(blink_core_output_dir)/MathMLNames.cpp', |
- '<(blink_core_output_dir)/SVGNames.cpp', |
- '<(blink_core_output_dir)/XLinkNames.cpp', |
- '<(blink_core_output_dir)/XMLNSNames.cpp', |
- '<(blink_core_output_dir)/XMLNames.cpp', |
- |
- # Generated from HTMLEntityNames.in |
- '<(blink_core_output_dir)/HTMLEntityTable.cpp', |
- |
- # Generated from MediaFeatureNames.in |
- '<(blink_core_output_dir)/MediaFeatureNames.cpp', |
- |
- # Generated from MediaTypeNames.in |
- '<(blink_core_output_dir)/MediaTypeNames.cpp', |
- |
- # Generated from BisonCSSTokenizer-in.cpp |
- '<(blink_core_output_dir)/BisonCSSTokenizer.cpp', |
- |
- # Generated from BisonCSSParser-in.cpp |
- '<(blink_core_output_dir)/BisonCSSParser.cpp', |
- |
- # Generated from HTMLMetaElement-in.cpp |
- '<(blink_core_output_dir)/HTMLMetaElement.cpp', |
- |
- # Additional .cpp files from the make_core_generated rules. |
- '<(blink_core_output_dir)/CSSGrammar.cpp', |
- '<(blink_core_output_dir)/XPathGrammar.cpp', |
- |
- # Additional .cpp files from the inspector_protocol_sources list. |
- '<(blink_core_output_dir)/InspectorFrontend.cpp', |
- '<(blink_core_output_dir)/InspectorBackendDispatcher.cpp', |
- '<(blink_core_output_dir)/InspectorTypeBuilder.cpp', |
- |
- # Additional .cpp files from the inspector_instrumentation_sources list. |
- '<(blink_core_output_dir)/InspectorCanvasInstrumentationInl.h', |
- '<(blink_core_output_dir)/InspectorConsoleInstrumentationInl.h', |
- '<(blink_core_output_dir)/InspectorInstrumentationInl.h', |
- '<(blink_core_output_dir)/InspectorOverridesInl.h', |
- '<(blink_core_output_dir)/InstrumentingAgentsInl.h', |
- '<(blink_core_output_dir)/InspectorInstrumentationImpl.cpp', |
- |
- # Additional .cpp files for SVG. |
- '<(blink_core_output_dir)/SVGElementFactory.cpp', |
- |
- # Generated from make_style_shorthands.py |
- '<(blink_core_output_dir)/StylePropertyShorthand.cpp', |
- |
- # Generated from make_style_builder.py |
- '<(blink_core_output_dir)/StyleBuilder.cpp', |
- '<(blink_core_output_dir)/StyleBuilderFunctions.cpp', |
- |
- # Generated from make_css_property_metadata.py |
- '<(blink_core_output_dir)/CSSPropertyMetadata.cpp', |
+ '<@(generated_core_additional_files)', |
# IDL dictionary impl files generated by IDL compiler |
'<@(generated_core_dictionary_files)', |
@@ -737,42 +664,198 @@ |
# Note: file list duplicated in GN build. |
'<@(generated_core_testing_dictionary_files)', |
'<@(webcore_testing_files)', |
- '<(bindings_core_v8_output_dir)/V8DictionaryTest.cpp', |
- '<(bindings_core_v8_output_dir)/V8DictionaryTest.h', |
- '<(bindings_core_v8_output_dir)/V8GarbageCollectedScriptWrappable.cpp', |
- '<(bindings_core_v8_output_dir)/V8GarbageCollectedScriptWrappable.h', |
- '<(bindings_core_v8_output_dir)/V8GCObservation.cpp', |
- '<(bindings_core_v8_output_dir)/V8GCObservation.h', |
- '<(bindings_core_v8_output_dir)/V8PrivateScriptTest.cpp', |
- '<(bindings_core_v8_output_dir)/V8PrivateScriptTest.h', |
- '<(bindings_core_v8_output_dir)/V8TypeConversions.cpp', |
- '<(bindings_core_v8_output_dir)/V8TypeConversions.h', |
- '<(bindings_core_v8_output_dir)/V8UnionTypesTest.cpp', |
- '<(bindings_core_v8_output_dir)/V8UnionTypesTest.h', |
- '<(bindings_core_v8_output_dir)/V8Internals.cpp', |
- '<(bindings_core_v8_output_dir)/V8Internals.h', |
- '<(bindings_core_v8_output_dir)/V8InternalSettings.cpp', |
- '<(bindings_core_v8_output_dir)/V8InternalSettings.h', |
- '<(bindings_core_v8_output_dir)/V8InternalSettingsGenerated.cpp', |
- '<(bindings_core_v8_output_dir)/V8InternalSettingsGenerated.h', |
- '<(bindings_core_v8_output_dir)/V8InternalRuntimeFlags.cpp', |
- '<(bindings_core_v8_output_dir)/V8InternalRuntimeFlags.h', |
- '<(bindings_core_v8_output_dir)/V8LayerRect.cpp', |
- '<(bindings_core_v8_output_dir)/V8LayerRect.h', |
- '<(bindings_core_v8_output_dir)/V8LayerRectList.cpp', |
- '<(bindings_core_v8_output_dir)/V8LayerRectList.h', |
- '<(bindings_core_v8_output_dir)/V8RefCountedScriptWrappable.cpp', |
- '<(bindings_core_v8_output_dir)/V8RefCountedScriptWrappable.h', |
- '<(bindings_core_v8_output_dir)/V8InternalDictionary.cpp', |
- '<(bindings_core_v8_output_dir)/V8InternalDictionary.h', |
- '<(bindings_core_v8_output_dir)/V8InternalDictionaryDerived.cpp', |
- '<(bindings_core_v8_output_dir)/V8InternalDictionaryDerived.h', |
- '<(bindings_core_v8_output_dir)/V8PluginPlaceholderOptions.cpp', |
- '<(bindings_core_v8_output_dir)/V8PluginPlaceholderOptions.h', |
+ '<@(generated_bindings_core_testing_files)', |
], |
'sources/': [ |
['exclude', 'testing/js'], |
], |
}, |
+ { |
+ # GN version: //third_party/WebKit/Source/core:core |
+ 'target_name': 'webcore_shared', |
+ 'type': 'shared_library', |
+ 'hard_dependency': 1, |
+ 'dependencies': [ |
+ 'webcore_prerequisites', |
+ |
+ '../platform/blink_platform.gyp:blink_common', |
+ '../platform/blink_platform.gyp:blink_platform', |
+ |
+ # webcore_generated dependency |
+ 'core_generated.gyp:make_core_generated', |
+ 'inspector_protocol_sources', |
+ 'inspector_instrumentation_sources', |
+ '../bindings/core/v8/generated.gyp:bindings_core_v8_generated', |
+ # FIXME: don't depend on bindings_modules http://crbug.com/358074 |
+ '../bindings/modules/generated.gyp:modules_event_generated', |
+ '../bindings/modules/v8/generated.gyp:bindings_modules_v8_generated', |
+ '../platform/platform_generated.gyp:make_platform_generated', |
+ |
+ '../wtf/wtf.gyp:wtf', |
+ '<(DEPTH)/gin/gin.gyp:gin', |
+ '<(DEPTH)/skia/skia.gyp:skia', |
+ '<(DEPTH)/third_party/libxml/libxml.gyp:libxml', |
+ '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt', |
+ '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', |
+ '<(DEPTH)/third_party/qcms/qcms.gyp:qcms', |
+ '<(DEPTH)/third_party/snappy/snappy.gyp:snappy', |
+ '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite', |
+ '<(DEPTH)/url/url.gyp:url_lib', |
+ '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', |
+ ], |
+ 'export_dependent_settings': [ |
+ '../platform/blink_platform.gyp:blink_platform', |
+ '../wtf/wtf.gyp:wtf', |
+ '<(DEPTH)/skia/skia.gyp:skia', |
+ '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', |
+ '<(DEPTH)/third_party/qcms/qcms.gyp:qcms', |
+ '<(DEPTH)/url/url.gyp:url_lib', |
+ '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', |
+ ], |
+ 'direct_dependent_settings': { |
+ 'include_dirs': [ |
+ '<@(webcore_include_dirs)', |
+ ], |
+ }, |
+ 'conditions': [ |
+ ['component!="shared_library" or link_core_modules_separately==0', { |
+ }, { |
+ 'defines': [ |
+ 'BLINK_CORE_IMPLEMENTATION=1', |
+ 'BLINK_IMPLEMENTATION=1', |
+ 'INSIDE_BLINK', |
+ ], |
+ 'sources': [ |
+ # webcore_generated |
+ '<@(bindings_core_v8_files)', |
+ '<@(bindings_core_v8_generated_aggregate_files)', |
+ '<@(bindings_core_v8_generated_union_type_files)', |
+ '<@(generated_core_additional_files)', |
+ '<@(generated_core_dictionary_files)', |
+ |
+ # webcore_non_rendering, webcore_rendering |
+ '<@(webcore_rendering_files)', |
+ '<@(webcore_non_rendering_files)', |
+ # webcore_dom |
+ '<@(webcore_dom_files)', |
+ # webcore_svg |
+ '<@(webcore_svg_files)', |
+ # webcore_html |
+ '<@(webcore_html_files)', |
+ # webcore_testing |
+ '<@(generated_core_testing_dictionary_files)', |
+ '<@(webcore_testing_files)', |
+ '<@(generated_bindings_core_testing_files)', |
+ ], |
+ 'include_dirs': [ |
+ '<@(webcore_include_dirs)', |
+ '../..', # WebKit |
+ # for testing_files |
+ 'testing', |
+ 'testing/v8', |
+ ], |
+ 'conditions': [ |
+ ['use_default_render_theme==0 and OS != "android"', { |
+ 'sources!': [ |
+ 'layout/LayoutThemeChromiumDefault.cpp', |
+ 'layout/LayoutThemeChromiumDefault.h', |
+ ], |
+ }], |
+ ['OS=="win"', { |
+ # In generated bindings code: 'switch contains default but no |
+ # case'. |
+ # Disable c4267 warnings until we fix size_t to int truncations. |
+ # 4701 and 4702 are disabled because of issues in Bison-generated |
+ # XPathGrammar.cpp and CSSGrammar.cpp. |
+ # Disable c4267 warnings until we fix size_t to int truncations. |
+ 'msvs_disabled_warnings': [ 4065, 4267, 4305, 4334, 4701, 4702 ], |
+ }, { |
+ 'sources!': [ |
+ 'layout/LayoutThemeChromiumFontProviderWin.cpp', |
+ 'layout/LayoutThemeChromiumWin.cpp', |
+ 'layout/LayoutThemeChromiumWin.h', |
+ ], |
+ 'libraries': [ |
+ '-lm -lstdc++', |
+ ], |
+ }], |
+ ['OS=="win" and chromium_win_pch==1', { |
+ 'sources/': [ |
+ ['include', '<(DEPTH)/third_party/WebKit/Source/build/win/Precompile.cpp'], |
+ ], |
+ }], |
+ ['OS=="mac"', { |
+ 'sources!': [ |
+ # LayoutThemeChromiumSkia is not used on mac since LayoutThemeChromiumMac |
+ # does not reference the Skia code that is used by Windows, Linux and Android. |
+ 'layout/LayoutThemeChromiumSkia.cpp', |
+ 'layout/LayoutThemeChromiumSkia.h', |
+ |
+ # LayoutThemeChromiumFontProvider is used by LayoutThemeChromiumSkia. |
+ 'layout/LayoutThemeChromiumFontProvider.cpp', |
+ 'layout/LayoutThemeChromiumFontProvider.h', |
+ ], |
+ 'link_settings': { |
+ 'libraries': [ |
+ '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', |
+ ], |
+ }, |
+ },{ # OS!="mac" |
+ 'sources!': [ |
+ 'editing/SmartReplaceCF.cpp', |
+ 'layout/LayoutThemeChromiumMac.h', |
+ 'layout/LayoutThemeChromiumMac.mm', |
+ ], |
+ }], |
+ ['OS == "android" and target_arch == "ia32" and gcc_version == 46', { |
+ # Due to a bug in gcc 4.6 in android NDK, we get warnings about uninitialized variable. |
+ 'cflags': ['-Wno-uninitialized'], |
+ }], |
+ ['OS != "linux"', { |
+ 'sources!': [ |
+ 'layout/LayoutThemeChromiumLinux.cpp', |
+ 'layout/LayoutThemeChromiumLinux.h', |
+ ], |
+ }], |
+ ['OS != "linux" and OS != "android"', { |
+ 'sources!': [ |
+ 'layout/LayoutThemeChromiumFontProviderLinux.cpp', |
+ ], |
+ }], |
+ ['OS=="android"', { |
+ 'cflags': [ |
+ # WebCore does not work with strict aliasing enabled. |
+ # https://bugs.webkit.org/show_bug.cgi?id=25864 |
+ '-fno-strict-aliasing', |
+ ], |
+ }, { |
+ 'sources!': [ |
+ 'layout/LayoutThemeChromiumAndroid.cpp', |
+ 'layout/LayoutThemeChromiumAndroid.h', |
+ ], |
+ }], |
+ ], |
+ }], |
+ ['OS=="linux" and "WTF_USE_WEBAUDIO_IPP=1" in feature_defines', { |
+ 'link_settings': { |
+ 'ldflags': [ |
+ '<!@(pkg-config --libs-only-L ipp)', |
+ ], |
+ 'libraries': [ |
+ '-lipps -lippcore', |
+ ], |
+ }, |
+ }], |
+ # Use IPP static libraries for x86 Android. |
+ ['OS=="android" and "WTF_USE_WEBAUDIO_IPP=1" in feature_defines', { |
+ 'link_settings': { |
+ 'libraries': [ |
+ '<!@(pkg-config --libs ipp|sed s/-L//)/libipps_l.a', |
+ '<!@(pkg-config --libs ipp|sed s/-L//)/libippcore_l.a', |
+ ] |
+ }, |
+ }], |
+ ], |
+ }, |
], # targets |
} |