| Index: Source/core/core_generated.gyp
|
| diff --git a/Source/core/core_generated.gyp b/Source/core/core_generated.gyp
|
| index 1564e5ea23574029f87993692cf9624f00909ea0..352b14dffe81b96b337a8ffe48398e0652a0a346 100644
|
| --- a/Source/core/core_generated.gyp
|
| +++ b/Source/core/core_generated.gyp
|
| @@ -57,7 +57,7 @@
|
| '<@(event_idl_files)',
|
| ],
|
| 'outputs': [
|
| - '<(blink_output_dir)/EventInterfaces.in',
|
| + '<(core_output_dir)/EventInterfaces.in',
|
| ],
|
| 'action': [
|
| 'python',
|
| @@ -65,7 +65,7 @@
|
| '--event-idl-files-list',
|
| '<(event_idl_files_list)',
|
| '--event-interfaces-file',
|
| - '<(blink_output_dir)/EventInterfaces.in',
|
| + '<(core_output_dir)/EventInterfaces.in',
|
| '--write-file-only-if-changed',
|
| '<(write_file_only_if_changed)',
|
| ],
|
| @@ -88,17 +88,17 @@
|
| 'frame/Settings.in',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/SettingsMacros.h',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/InternalSettingsGenerated.idl',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/InternalSettingsGenerated.cpp',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/InternalSettingsGenerated.h',
|
| + '<(core_output_dir)/SettingsMacros.h',
|
| + '<(core_output_dir)/InternalSettingsGenerated.idl',
|
| + '<(core_output_dir)/InternalSettingsGenerated.cpp',
|
| + '<(core_output_dir)/InternalSettingsGenerated.h',
|
| ],
|
| 'action': [
|
| 'python',
|
| '../build/scripts/make_settings.py',
|
| 'frame/Settings.in',
|
| '--output_dir',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '<(core_output_dir)',
|
| ],
|
| },
|
| {
|
| @@ -111,15 +111,15 @@
|
| '../build/scripts/templates/InternalRuntimeFlags.idl.tmpl',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/InternalRuntimeFlags.idl',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/InternalRuntimeFlags.h',
|
| + '<(core_output_dir)/InternalRuntimeFlags.idl',
|
| + '<(core_output_dir)/InternalRuntimeFlags.h',
|
| ],
|
| 'action': [
|
| 'python',
|
| '../build/scripts/make_internal_runtime_flags.py',
|
| '../platform/RuntimeEnabledFeatures.in',
|
| '--output_dir',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '<(core_output_dir)',
|
| ],
|
| },
|
| ]
|
| @@ -145,7 +145,7 @@
|
| 'xml/XMLViewer.css',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/XMLViewerCSS.h',
|
| + '<(core_output_dir)/XMLViewerCSS.h',
|
| ],
|
| 'action': [
|
| 'python',
|
| @@ -161,7 +161,7 @@
|
| 'xml/XMLViewer.js',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/XMLViewerJS.h',
|
| + '<(core_output_dir)/XMLViewerJS.h',
|
| ],
|
| 'action': [
|
| 'python',
|
| @@ -178,7 +178,7 @@
|
| 'html/parser/HTMLEntityNames.in',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/HTMLEntityTable.cpp'
|
| + '<(core_output_dir)/HTMLEntityTable.cpp'
|
| ],
|
| 'action': [
|
| 'python',
|
| @@ -202,15 +202,15 @@
|
| '<@(in_files)'
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/CSSPropertyNames.cpp',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/CSSPropertyNames.h',
|
| + '<(core_output_dir)/CSSPropertyNames.cpp',
|
| + '<(core_output_dir)/CSSPropertyNames.h',
|
| ],
|
| 'action': [
|
| 'python',
|
| '../build/scripts/make_css_property_names.py',
|
| '<@(in_files)',
|
| '--output_dir',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '<(core_output_dir)',
|
| '--gperf', '<(gperf_exe)',
|
| '--defines', '<(feature_defines)',
|
| ],
|
| @@ -228,15 +228,15 @@
|
| '<@(in_files)'
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/MediaFeatureNames.cpp',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/MediaFeatureNames.h',
|
| + '<(core_output_dir)/MediaFeatureNames.cpp',
|
| + '<(core_output_dir)/MediaFeatureNames.h',
|
| ],
|
| 'action': [
|
| 'python',
|
| '../build/scripts/make_media_feature_names.py',
|
| '<@(in_files)',
|
| '--output_dir',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '<(core_output_dir)',
|
| '--defines', '<(feature_defines)',
|
| ],
|
| },
|
| @@ -254,14 +254,14 @@
|
| '<@(in_files)'
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/MediaFeatures.h',
|
| + '<(core_output_dir)/MediaFeatures.h',
|
| ],
|
| 'action': [
|
| 'python',
|
| '../build/scripts/make_media_features.py',
|
| '<@(in_files)',
|
| '--output_dir',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '<(core_output_dir)',
|
| '--defines', '<(feature_defines)',
|
| ],
|
| },
|
| @@ -277,15 +277,15 @@
|
| '<@(in_files)'
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/MediaTypeNames.cpp',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/MediaTypeNames.h',
|
| + '<(core_output_dir)/MediaTypeNames.cpp',
|
| + '<(core_output_dir)/MediaTypeNames.h',
|
| ],
|
| 'action': [
|
| 'python',
|
| '../build/scripts/make_names.py',
|
| '<@(in_files)',
|
| '--output_dir',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '<(core_output_dir)',
|
| '--defines', '<(feature_defines)',
|
| ],
|
| },
|
| @@ -295,13 +295,13 @@
|
| '../build/scripts/make_mediaquery_tokenizer_codepoints.py',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/MediaQueryTokenizerCodepoints.cpp',
|
| + '<(core_output_dir)/MediaQueryTokenizerCodepoints.cpp',
|
| ],
|
| 'action': [
|
| 'python',
|
| '../build/scripts/make_mediaquery_tokenizer_codepoints.py',
|
| '--output_dir',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '<(core_output_dir)',
|
| '--defines', '<(feature_defines)',
|
| ],
|
| },
|
| @@ -315,15 +315,15 @@
|
| 'css/CSSShorthands.in',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/StylePropertyShorthand.cpp',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/StylePropertyShorthand.h',
|
| + '<(core_output_dir)/StylePropertyShorthand.cpp',
|
| + '<(core_output_dir)/StylePropertyShorthand.h',
|
| ],
|
| 'action': [
|
| 'python',
|
| '../build/scripts/make_style_shorthands.py',
|
| 'css/CSSShorthands.in',
|
| '--output_dir',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '<(core_output_dir)',
|
| ],
|
| },
|
| {
|
| @@ -337,16 +337,16 @@
|
| 'css/CSSProperties.in',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/StyleBuilder.cpp',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/StyleBuilderFunctions.h',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/StyleBuilderFunctions.cpp',
|
| + '<(core_output_dir)/StyleBuilder.cpp',
|
| + '<(core_output_dir)/StyleBuilderFunctions.h',
|
| + '<(core_output_dir)/StyleBuilderFunctions.cpp',
|
| ],
|
| 'action': [
|
| 'python',
|
| '../build/scripts/make_style_builder.py',
|
| 'css/CSSProperties.in',
|
| '--output_dir',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '<(core_output_dir)',
|
| ],
|
| },
|
| {
|
| @@ -363,15 +363,15 @@
|
| '<@(in_files)'
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/CSSValueKeywords.cpp',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/CSSValueKeywords.h',
|
| + '<(core_output_dir)/CSSValueKeywords.cpp',
|
| + '<(core_output_dir)/CSSValueKeywords.h',
|
| ],
|
| 'action': [
|
| 'python',
|
| '../build/scripts/make_css_value_keywords.py',
|
| '<@(in_files)',
|
| '--output_dir',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '<(core_output_dir)',
|
| '--gperf', '<(gperf_exe)',
|
| '--defines', '<(feature_defines)',
|
| ],
|
| @@ -384,12 +384,12 @@
|
| 'html/HTMLAttributeNames.in',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/HTMLElementFactory.cpp',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/HTMLElementFactory.h',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/HTMLNames.cpp',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/HTMLNames.h',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/V8HTMLElementWrapperFactory.cpp',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/V8HTMLElementWrapperFactory.h',
|
| + '<(core_output_dir)/HTMLElementFactory.cpp',
|
| + '<(core_output_dir)/HTMLElementFactory.h',
|
| + '<(core_output_dir)/HTMLNames.cpp',
|
| + '<(core_output_dir)/HTMLNames.h',
|
| + '<(core_output_dir)/V8HTMLElementWrapperFactory.cpp',
|
| + '<(core_output_dir)/V8HTMLElementWrapperFactory.h',
|
| ],
|
| 'action': [
|
| 'python',
|
| @@ -397,7 +397,7 @@
|
| 'html/HTMLTagNames.in',
|
| 'html/HTMLAttributeNames.in',
|
| '--output_dir',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '<(core_output_dir)',
|
| ],
|
| },
|
| {
|
| @@ -407,14 +407,14 @@
|
| 'html/HTMLTagNames.in',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/HTMLElementTypeHelpers.h',
|
| + '<(core_output_dir)/HTMLElementTypeHelpers.h',
|
| ],
|
| 'action': [
|
| 'python',
|
| '../build/scripts/make_element_type_helpers.py',
|
| 'html/HTMLTagNames.in',
|
| '--output_dir',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '<(core_output_dir)',
|
| ],
|
| },
|
| {
|
| @@ -425,12 +425,12 @@
|
| 'svg/SVGAttributeNames.in',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/SVGElementFactory.cpp',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/SVGElementFactory.h',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/SVGNames.cpp',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/SVGNames.h',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/V8SVGElementWrapperFactory.cpp',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/V8SVGElementWrapperFactory.h',
|
| + '<(core_output_dir)/SVGElementFactory.cpp',
|
| + '<(core_output_dir)/SVGElementFactory.h',
|
| + '<(core_output_dir)/SVGNames.cpp',
|
| + '<(core_output_dir)/SVGNames.h',
|
| + '<(core_output_dir)/V8SVGElementWrapperFactory.cpp',
|
| + '<(core_output_dir)/V8SVGElementWrapperFactory.h',
|
| ],
|
| 'action': [
|
| 'python',
|
| @@ -438,7 +438,7 @@
|
| 'svg/SVGTagNames.in',
|
| 'svg/SVGAttributeNames.in',
|
| '--output_dir',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '<(core_output_dir)',
|
| ],
|
| },
|
| {
|
| @@ -448,53 +448,53 @@
|
| 'svg/SVGTagNames.in',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/SVGElementTypeHelpers.h',
|
| + '<(core_output_dir)/SVGElementTypeHelpers.h',
|
| ],
|
| 'action': [
|
| 'python',
|
| '../build/scripts/make_element_type_helpers.py',
|
| 'svg/SVGTagNames.in',
|
| '--output_dir',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '<(core_output_dir)',
|
| ],
|
| },
|
| {
|
| 'action_name': 'EventFactory',
|
| 'inputs': [
|
| '<@(make_event_factory_files)',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/EventInterfaces.in',
|
| + '<(core_output_dir)/EventInterfaces.in',
|
| 'events/EventAliases.in',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/Event.cpp',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/EventHeaders.h',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/EventInterfaces.h',
|
| + '<(core_output_dir)/Event.cpp',
|
| + '<(core_output_dir)/EventHeaders.h',
|
| + '<(core_output_dir)/EventInterfaces.h',
|
| ],
|
| 'action': [
|
| 'python',
|
| '../build/scripts/make_event_factory.py',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/EventInterfaces.in',
|
| + '<(core_output_dir)/EventInterfaces.in',
|
| 'events/EventAliases.in',
|
| '--output_dir',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '<(core_output_dir)',
|
| ],
|
| },
|
| {
|
| 'action_name': 'EventNames',
|
| 'inputs': [
|
| '<@(make_names_files)',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/EventInterfaces.in',
|
| + '<(core_output_dir)/EventInterfaces.in',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/EventNames.cpp',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/EventNames.h',
|
| + '<(core_output_dir)/EventNames.cpp',
|
| + '<(core_output_dir)/EventNames.h',
|
| ],
|
| 'action': [
|
| 'python',
|
| '../build/scripts/make_names.py',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/EventInterfaces.in',
|
| + '<(core_output_dir)/EventInterfaces.in',
|
| '--output_dir',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '<(core_output_dir)',
|
| ],
|
| },
|
| {
|
| @@ -504,15 +504,15 @@
|
| 'events/EventTargetFactory.in',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/EventTargetHeaders.h',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/EventTargetInterfaces.h',
|
| + '<(core_output_dir)/EventTargetHeaders.h',
|
| + '<(core_output_dir)/EventTargetInterfaces.h',
|
| ],
|
| 'action': [
|
| 'python',
|
| '../build/scripts/make_event_factory.py',
|
| 'events/EventTargetFactory.in',
|
| '--output_dir',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '<(core_output_dir)',
|
| ],
|
| },
|
| {
|
| @@ -522,15 +522,15 @@
|
| 'events/EventTargetFactory.in',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/EventTargetNames.cpp',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/EventTargetNames.h',
|
| + '<(core_output_dir)/EventTargetNames.cpp',
|
| + '<(core_output_dir)/EventTargetNames.h',
|
| ],
|
| 'action': [
|
| 'python',
|
| '../build/scripts/make_names.py',
|
| 'events/EventTargetFactory.in',
|
| '--output_dir',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '<(core_output_dir)',
|
| ],
|
| },
|
| {
|
| @@ -541,8 +541,8 @@
|
| 'html/parser/MathMLAttributeNames.in',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/MathMLNames.cpp',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/MathMLNames.h',
|
| + '<(core_output_dir)/MathMLNames.cpp',
|
| + '<(core_output_dir)/MathMLNames.h',
|
| ],
|
| 'action': [
|
| 'python',
|
| @@ -550,7 +550,7 @@
|
| 'html/parser/MathMLTagNames.in',
|
| 'html/parser/MathMLAttributeNames.in',
|
| '--output_dir',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '<(core_output_dir)',
|
| '--defines', '<(feature_defines)'
|
| ],
|
| },
|
| @@ -587,8 +587,8 @@
|
| '<@(stylesheets)'
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/UserAgentStyleSheets.h',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/UserAgentStyleSheetsData.cpp',
|
| + '<(core_output_dir)/UserAgentStyleSheets.h',
|
| + '<(core_output_dir)/UserAgentStyleSheetsData.cpp',
|
| ],
|
| 'action': [
|
| 'python',
|
| @@ -610,15 +610,15 @@
|
| 'fetch/FetchInitiatorTypeNames.in',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/FetchInitiatorTypeNames.cpp',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/FetchInitiatorTypeNames.h',
|
| + '<(core_output_dir)/FetchInitiatorTypeNames.cpp',
|
| + '<(core_output_dir)/FetchInitiatorTypeNames.h',
|
| ],
|
| 'action': [
|
| 'python',
|
| '../build/scripts/make_names.py',
|
| 'fetch/FetchInitiatorTypeNames.in',
|
| '--output_dir',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '<(core_output_dir)',
|
| ],
|
| },
|
| {
|
| @@ -628,15 +628,15 @@
|
| 'events/EventTypeNames.in',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/EventTypeNames.cpp',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/EventTypeNames.h',
|
| + '<(core_output_dir)/EventTypeNames.cpp',
|
| + '<(core_output_dir)/EventTypeNames.h',
|
| ],
|
| 'action': [
|
| 'python',
|
| '../build/scripts/make_names.py',
|
| 'events/EventTypeNames.in',
|
| '--output_dir',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '<(core_output_dir)',
|
| ],
|
| },
|
| {
|
| @@ -646,15 +646,15 @@
|
| 'html/parser/HTMLTokenizerNames.in',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/HTMLTokenizerNames.cpp',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/HTMLTokenizerNames.h',
|
| + '<(core_output_dir)/HTMLTokenizerNames.cpp',
|
| + '<(core_output_dir)/HTMLTokenizerNames.h',
|
| ],
|
| 'action': [
|
| 'python',
|
| '../build/scripts/make_names.py',
|
| 'html/parser/HTMLTokenizerNames.in',
|
| '--output_dir',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '<(core_output_dir)',
|
| ],
|
| },
|
| {
|
| @@ -664,15 +664,15 @@
|
| 'html/forms/InputTypeNames.in',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/InputTypeNames.cpp',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/InputTypeNames.h',
|
| + '<(core_output_dir)/InputTypeNames.cpp',
|
| + '<(core_output_dir)/InputTypeNames.h',
|
| ],
|
| 'action': [
|
| 'python',
|
| '../build/scripts/make_names.py',
|
| 'html/forms/InputTypeNames.in',
|
| '--output_dir',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '<(core_output_dir)',
|
| ],
|
| },
|
| {
|
| @@ -682,15 +682,15 @@
|
| 'svg/xlinkattrs.in',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/XLinkNames.cpp',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/XLinkNames.h',
|
| + '<(core_output_dir)/XLinkNames.cpp',
|
| + '<(core_output_dir)/XLinkNames.h',
|
| ],
|
| 'action': [
|
| 'python',
|
| '../build/scripts/make_qualified_names.py',
|
| 'svg/xlinkattrs.in',
|
| '--output_dir',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '<(core_output_dir)',
|
| ],
|
| },
|
| {
|
| @@ -700,15 +700,15 @@
|
| 'xml/xmlnsattrs.in',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/XMLNSNames.cpp',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/XMLNSNames.h',
|
| + '<(core_output_dir)/XMLNSNames.cpp',
|
| + '<(core_output_dir)/XMLNSNames.h',
|
| ],
|
| 'action': [
|
| 'python',
|
| '../build/scripts/make_qualified_names.py',
|
| 'xml/xmlnsattrs.in',
|
| '--output_dir',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '<(core_output_dir)',
|
| ],
|
| },
|
| {
|
| @@ -718,15 +718,15 @@
|
| 'xml/xmlattrs.in',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/XMLNames.cpp',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/XMLNames.h',
|
| + '<(core_output_dir)/XMLNames.cpp',
|
| + '<(core_output_dir)/XMLNames.h',
|
| ],
|
| 'action': [
|
| 'python',
|
| '../build/scripts/make_qualified_names.py',
|
| 'xml/xmlattrs.in',
|
| '--output_dir',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '<(core_output_dir)',
|
| ],
|
| },
|
| {
|
| @@ -737,13 +737,13 @@
|
| '../core/css/CSSTokenizer-in.cpp',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/CSSTokenizer.cpp',
|
| + '<(core_output_dir)/CSSTokenizer.cpp',
|
| ],
|
| 'action': [
|
| 'python',
|
| '../build/scripts/make_token_matcher.py',
|
| '../core/css/CSSTokenizer-in.cpp',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/CSSTokenizer.cpp',
|
| + '<(core_output_dir)/CSSTokenizer.cpp',
|
| ],
|
| },
|
| {
|
| @@ -754,13 +754,13 @@
|
| '../core/css/parser/BisonCSSParser-in.cpp',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/BisonCSSParser.cpp',
|
| + '<(core_output_dir)/BisonCSSParser.cpp',
|
| ],
|
| 'action': [
|
| 'python',
|
| '../build/scripts/make_token_matcher.py',
|
| '../core/css/parser/BisonCSSParser-in.cpp',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/BisonCSSParser.cpp',
|
| + '<(core_output_dir)/BisonCSSParser.cpp',
|
| ],
|
| },
|
| {
|
| @@ -771,13 +771,13 @@
|
| '../core/html/HTMLMetaElement-in.cpp',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/HTMLMetaElement.cpp',
|
| + '<(core_output_dir)/HTMLMetaElement.cpp',
|
| ],
|
| 'action': [
|
| 'python',
|
| '../build/scripts/make_token_matcher.py',
|
| '../core/html/HTMLMetaElement-in.cpp',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/HTMLMetaElement.cpp',
|
| + '<(core_output_dir)/HTMLMetaElement.cpp',
|
| ],
|
| },
|
| {
|
| @@ -790,15 +790,15 @@
|
| 'html/HTMLTagNames.in',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/HTMLElementLookupTrie.cpp',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/HTMLElementLookupTrie.h',
|
| + '<(core_output_dir)/HTMLElementLookupTrie.cpp',
|
| + '<(core_output_dir)/HTMLElementLookupTrie.h',
|
| ],
|
| 'action': [
|
| 'python',
|
| '../build/scripts/make_element_lookup_trie.py',
|
| 'html/HTMLTagNames.in',
|
| '--output_dir',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '<(core_output_dir)',
|
| ],
|
| },
|
| ],
|
| @@ -807,14 +807,14 @@
|
| 'rule_name': 'bison',
|
| 'extension': 'y',
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/<(RULE_INPUT_ROOT).cpp',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/<(RULE_INPUT_ROOT).h'
|
| + '<(core_output_dir)/<(RULE_INPUT_ROOT).cpp',
|
| + '<(core_output_dir)/<(RULE_INPUT_ROOT).h'
|
| ],
|
| 'action': [
|
| 'python',
|
| '../build/scripts/rule_bison.py',
|
| '<(RULE_INPUT_PATH)',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '<(core_output_dir)',
|
| '<(bison_exe)',
|
| ],
|
| },
|
|
|