Separate the generated files from core and modules to their own sub-dirs.

Source/core/core_generated.gyp

 #
 # Copyright (C) 2013 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 40 matching lines @@
                 '<|(event_idl_files_list.tmp <@(event_idl_files))',
           },
           'inputs': [
             # FIXME: should be in build/scripts, not bindings/scripts
             '../bindings/scripts/generate_event_interfaces.py',
             '../bindings/scripts/utilities.py',
             '<(event_idl_files_list)',
             '<@(event_idl_files)',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/EventInterfaces.in',
+            '<(blink_core_output_dir)/EventInterfaces.in',
           ],
           'action': [
             'python',
             '../bindings/scripts/generate_event_interfaces.py',
             '--event-idl-files-list',
             '<(event_idl_files_list)',
             '--event-interfaces-file',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/EventInterfaces.in',
+            '<(blink_core_output_dir)/EventInterfaces.in',
             '--write-file-only-if-changed',
             '<(write_file_only_if_changed)',
           ],
         },
       ],
     },
     {
       'target_name': 'generated_testing_idls',
       'type': 'none',
       'actions': [
         {
           'action_name': 'Settings',
           'inputs': [
             '<@(scripts_for_in_files)',
             '../build/scripts/make_settings.py',
             '../build/scripts/templates/InternalSettingsGenerated.idl.tmpl',
             '../build/scripts/templates/InternalSettingsGenerated.cpp.tmpl',
             '../build/scripts/templates/InternalSettingsGenerated.h.tmpl',
             '../build/scripts/templates/SettingsMacros.h.tmpl',
             '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',
+            '<(blink_core_output_dir)/SettingsMacros.h',
+            '<(blink_core_output_dir)/InternalSettingsGenerated.idl',
+            '<(blink_core_output_dir)/InternalSettingsGenerated.cpp',
+            '<(blink_core_output_dir)/InternalSettingsGenerated.h',
           ],
           'action': [
             'python',
             '../build/scripts/make_settings.py',
             'frame/Settings.in',
             '--output_dir',
-            '<(SHARED_INTERMEDIATE_DIR)/blink',
+            '<(blink_core_output_dir)',
           ],
         },
         {
           'action_name': 'InternalRuntimeFlags',
           'inputs': [
             '<@(scripts_for_in_files)',
             '../build/scripts/make_internal_runtime_flags.py',
             '../platform/RuntimeEnabledFeatures.in',
             '../build/scripts/templates/InternalRuntimeFlags.h.tmpl',
             '../build/scripts/templates/InternalRuntimeFlags.idl.tmpl',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/InternalRuntimeFlags.idl',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/InternalRuntimeFlags.h',
+            '<(blink_core_output_dir)/InternalRuntimeFlags.idl',
+            '<(blink_core_output_dir)/InternalRuntimeFlags.h',
           ],
           'action': [
             'python',
             '../build/scripts/make_internal_runtime_flags.py',
             '../platform/RuntimeEnabledFeatures.in',
             '--output_dir',
-            '<(SHARED_INTERMEDIATE_DIR)/blink',
+            '<(blink_core_output_dir)',
           ],
         },
       ]
     },
     {
       'target_name': 'make_core_generated',
       'type': 'none',
       'hard_dependency': 1,
       'dependencies': [
         'generated_testing_idls',
         'core_event_interfaces',
         '../config.gyp:config',
       ],
       'sources': [
         # bison rule
         'css/CSSGrammar.y',
         'xml/XPathGrammar.y',
       ],
       'actions': [
         {
           'action_name': 'generateXMLViewerCSS',
           'inputs': [
             'xml/XMLViewer.css',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/XMLViewerCSS.h',
+            '<(blink_core_output_dir)/XMLViewerCSS.h',
           ],
           'action': [
             'python',
             '../build/scripts/xxd.py',
             'XMLViewer_css',
             '<@(_inputs)',
             '<@(_outputs)'
           ],
         },
         {
           'action_name': 'generateXMLViewerJS',
           'inputs': [
             'xml/XMLViewer.js',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/XMLViewerJS.h',
+            '<(blink_core_output_dir)/XMLViewerJS.h',
           ],
           'action': [
             'python',
             '../build/scripts/xxd.py',
             'XMLViewer_js',
             '<@(_inputs)',
             '<@(_outputs)'
           ],
         },
         {
           'action_name': 'HTMLEntityTable',
           'inputs': [
             'html/parser/create-html-entity-table',
             'html/parser/HTMLEntityNames.in',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/HTMLEntityTable.cpp'
+            '<(blink_core_output_dir)/HTMLEntityTable.cpp'
           ],
           'action': [
             'python',
             'html/parser/create-html-entity-table',
             '-o',
             '<@(_outputs)',
             '<@(_inputs)'
           ],
         },
         {
           'action_name': 'CSSPropertyNames',
           'variables': {
             'in_files': [
               'css/CSSPropertyNames.in',
               'css/SVGCSSPropertyNames.in',
             ],
           },
           'inputs': [
             '<@(scripts_for_in_files)',
             '../build/scripts/make_css_property_names.py',
             '<@(in_files)'
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/CSSPropertyNames.cpp',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/CSSPropertyNames.h',
+            '<(blink_core_output_dir)/CSSPropertyNames.cpp',
+            '<(blink_core_output_dir)/CSSPropertyNames.h',
           ],
           'action': [
             'python',
             '../build/scripts/make_css_property_names.py',
             '<@(in_files)',
             '--output_dir',
-            '<(SHARED_INTERMEDIATE_DIR)/blink',
+            '<(blink_core_output_dir)',
             '--gperf', '<(gperf_exe)',
             '--defines', '<(feature_defines)',
           ],
         },
         {
           'action_name': 'MediaFeatureNames',
           'variables': {
             'in_files': [
               'css/MediaFeatureNames.in',
             ],
           },
           'inputs': [
             '<@(make_names_files)',
             '../build/scripts/make_media_feature_names.py',
             '<@(in_files)'
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/MediaFeatureNames.cpp',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/MediaFeatureNames.h',
+            '<(blink_core_output_dir)/MediaFeatureNames.cpp',
+            '<(blink_core_output_dir)/MediaFeatureNames.h',
           ],
           'action': [
             'python',
             '../build/scripts/make_media_feature_names.py',
             '<@(in_files)',
             '--output_dir',
-            '<(SHARED_INTERMEDIATE_DIR)/blink',
+            '<(blink_core_output_dir)',
             '--defines', '<(feature_defines)',
           ],
         },
         {
           'action_name': 'MediaFeatures',
           'variables': {
             'in_files': [
               'css/MediaFeatureNames.in',
             ],
           },
           'inputs': [
             '<@(scripts_for_in_files)',
             '../build/scripts/make_media_features.py',
             '../build/scripts/templates/MediaFeatures.h.tmpl',
             '<@(in_files)'
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/MediaFeatures.h',
+            '<(blink_core_output_dir)/MediaFeatures.h',
           ],
           'action': [
             'python',
             '../build/scripts/make_media_features.py',
             '<@(in_files)',
             '--output_dir',
-            '<(SHARED_INTERMEDIATE_DIR)/blink',
+            '<(blink_core_output_dir)',
             '--defines', '<(feature_defines)',
           ],
         },
         {
           'action_name': 'MediaTypeNames',
           'variables': {
             'in_files': [
               'css/MediaTypeNames.in',
             ],
           },
           'inputs': [
             '<@(make_names_files)',
             '<@(in_files)'
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/MediaTypeNames.cpp',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/MediaTypeNames.h',
+            '<(blink_core_output_dir)/MediaTypeNames.cpp',
+            '<(blink_core_output_dir)/MediaTypeNames.h',
           ],
           'action': [
             'python',
             '../build/scripts/make_names.py',
             '<@(in_files)',
             '--output_dir',
-            '<(SHARED_INTERMEDIATE_DIR)/blink',
+            '<(blink_core_output_dir)',
             '--defines', '<(feature_defines)',
           ],
         },
         {
           'action_name': 'MediaQueryTokenizerCodepoints',
           'inputs': [
             '../build/scripts/make_mediaquery_tokenizer_codepoints.py',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/MediaQueryTokenizerCodepoints.cpp',
+            '<(blink_core_output_dir)/MediaQueryTokenizerCodepoints.cpp',
           ],
           'action': [
             'python',
             '../build/scripts/make_mediaquery_tokenizer_codepoints.py',
             '--output_dir',
-            '<(SHARED_INTERMEDIATE_DIR)/blink',
+            '<(blink_core_output_dir)',
             '--defines', '<(feature_defines)',
           ],
         },
         {
           'action_name': 'StylePropertyShorthand',
           'inputs': [
             '<@(scripts_for_in_files)',
             '../build/scripts/make_style_shorthands.py',
             '../build/scripts/templates/StylePropertyShorthand.cpp.tmpl',
             '../build/scripts/templates/StylePropertyShorthand.h.tmpl',
             'css/CSSShorthands.in',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/StylePropertyShorthand.cpp',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/StylePropertyShorthand.h',
+            '<(blink_core_output_dir)/StylePropertyShorthand.cpp',
+            '<(blink_core_output_dir)/StylePropertyShorthand.h',
           ],
           'action': [
             'python',
             '../build/scripts/make_style_shorthands.py',
             'css/CSSShorthands.in',
             '--output_dir',
-            '<(SHARED_INTERMEDIATE_DIR)/blink',
+            '<(blink_core_output_dir)',
           ],
         },
         {
           'action_name': 'StyleBuilder',
           'inputs': [
             '<@(scripts_for_in_files)',
             '../build/scripts/make_style_builder.py',
             '../build/scripts/templates/StyleBuilder.cpp.tmpl',
             '../build/scripts/templates/StyleBuilderFunctions.cpp.tmpl',
             '../build/scripts/templates/StyleBuilderFunctions.h.tmpl',
             'css/CSSProperties.in',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/StyleBuilder.cpp',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/StyleBuilderFunctions.h',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/StyleBuilderFunctions.cpp',
+            '<(blink_core_output_dir)/StyleBuilder.cpp',
+            '<(blink_core_output_dir)/StyleBuilderFunctions.h',
+            '<(blink_core_output_dir)/StyleBuilderFunctions.cpp',
           ],
           'action': [
             'python',
             '../build/scripts/make_style_builder.py',
             'css/CSSProperties.in',
             '--output_dir',
-            '<(SHARED_INTERMEDIATE_DIR)/blink',
+            '<(blink_core_output_dir)',
           ],
         },
         {
           'action_name': 'CSSValueKeywords',
           'variables': {
             'in_files': [
               'css/CSSValueKeywords.in',
               'css/SVGCSSValueKeywords.in',
             ],
           },
           'inputs': [
             '<@(scripts_for_in_files)',
             '../build/scripts/make_css_value_keywords.py',
             '<@(in_files)'
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/CSSValueKeywords.cpp',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/CSSValueKeywords.h',
+            '<(blink_core_output_dir)/CSSValueKeywords.cpp',
+            '<(blink_core_output_dir)/CSSValueKeywords.h',
           ],
           'action': [
              'python',
              '../build/scripts/make_css_value_keywords.py',
              '<@(in_files)',
              '--output_dir',
-             '<(SHARED_INTERMEDIATE_DIR)/blink',
+             '<(blink_core_output_dir)',
             '--gperf', '<(gperf_exe)',
             '--defines', '<(feature_defines)',
           ],
         },
         {
           'action_name': 'HTMLElementFactory',
           'inputs': [
             '<@(make_element_factory_files)',
             'html/HTMLTagNames.in',
             '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',
+            '<(blink_core_output_dir)/HTMLElementFactory.cpp',
+            '<(blink_core_output_dir)/HTMLElementFactory.h',
+            '<(blink_core_output_dir)/HTMLNames.cpp',
+            '<(blink_core_output_dir)/HTMLNames.h',
+            '<(blink_core_output_dir)/V8HTMLElementWrapperFactory.cpp',
+            '<(blink_core_output_dir)/V8HTMLElementWrapperFactory.h',
           ],
           'action': [
             'python',
             '../build/scripts/make_element_factory.py',
             'html/HTMLTagNames.in',
             'html/HTMLAttributeNames.in',
             '--output_dir',
-            '<(SHARED_INTERMEDIATE_DIR)/blink',
+            '<(blink_core_output_dir)',
           ],
         },
         {
           'action_name': 'HTMLElementTypeHelpers',
           'inputs': [
             '<@(make_element_type_helpers_files)',
             'html/HTMLTagNames.in',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/HTMLElementTypeHelpers.h',
+            '<(blink_core_output_dir)/HTMLElementTypeHelpers.h',
           ],
           'action': [
             'python',
             '../build/scripts/make_element_type_helpers.py',
             'html/HTMLTagNames.in',
             '--output_dir',
-            '<(SHARED_INTERMEDIATE_DIR)/blink',
+            '<(blink_core_output_dir)',
           ],
         },
         {
           'action_name': 'SVGNames',
           'inputs': [
             '<@(make_element_factory_files)',
             'svg/SVGTagNames.in',
             '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',
+            '<(blink_core_output_dir)/SVGElementFactory.cpp',
+            '<(blink_core_output_dir)/SVGElementFactory.h',
+            '<(blink_core_output_dir)/SVGNames.cpp',
+            '<(blink_core_output_dir)/SVGNames.h',
+            '<(blink_core_output_dir)/V8SVGElementWrapperFactory.cpp',
+            '<(blink_core_output_dir)/V8SVGElementWrapperFactory.h',
           ],
           'action': [
             'python',
             '../build/scripts/make_element_factory.py',
             'svg/SVGTagNames.in',
             'svg/SVGAttributeNames.in',
             '--output_dir',
-            '<(SHARED_INTERMEDIATE_DIR)/blink',
+            '<(blink_core_output_dir)',
           ],
         },
         {
           'action_name': 'SVGElementTypeHelpers',
           'inputs': [
             '<@(make_element_type_helpers_files)',
             'svg/SVGTagNames.in',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/SVGElementTypeHelpers.h',
+            '<(blink_core_output_dir)/SVGElementTypeHelpers.h',
           ],
           'action': [
             'python',
             '../build/scripts/make_element_type_helpers.py',
             'svg/SVGTagNames.in',
             '--output_dir',
-            '<(SHARED_INTERMEDIATE_DIR)/blink',
+            '<(blink_core_output_dir)',
           ],
         },
         {
           'action_name': 'EventFactory',
           'inputs': [
             '<@(make_event_factory_files)',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/EventInterfaces.in',
+            '<(blink_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',
+            '<(blink_core_output_dir)/Event.cpp',
+            '<(blink_core_output_dir)/EventHeaders.h',
+            '<(blink_core_output_dir)/EventInterfaces.h',
           ],
           'action': [
             'python',
             '../build/scripts/make_event_factory.py',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/EventInterfaces.in',
+            '<(blink_core_output_dir)/EventInterfaces.in',
             'events/EventAliases.in',
             '--output_dir',
-            '<(SHARED_INTERMEDIATE_DIR)/blink',
+            '<(blink_core_output_dir)',
           ],
         },
         {
           'action_name': 'EventNames',
           'inputs': [
             '<@(make_names_files)',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/EventInterfaces.in',
+            '<(blink_core_output_dir)/EventInterfaces.in',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/EventNames.cpp',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/EventNames.h',
+            '<(blink_core_output_dir)/EventNames.cpp',
+            '<(blink_core_output_dir)/EventNames.h',
           ],
           'action': [
             'python',
             '../build/scripts/make_names.py',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/EventInterfaces.in',
+            '<(blink_core_output_dir)/EventInterfaces.in',
             '--output_dir',
-            '<(SHARED_INTERMEDIATE_DIR)/blink',
+            '<(blink_core_output_dir)',
           ],
         },
         {
           'action_name': 'EventTargetFactory',
           'inputs': [
             '<@(make_event_factory_files)',
             'events/EventTargetFactory.in',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/EventTargetHeaders.h',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/EventTargetInterfaces.h',
+            '<(blink_core_output_dir)/EventTargetHeaders.h',
+            '<(blink_core_output_dir)/EventTargetInterfaces.h',
           ],
           'action': [
             'python',
             '../build/scripts/make_event_factory.py',
             'events/EventTargetFactory.in',
             '--output_dir',
-            '<(SHARED_INTERMEDIATE_DIR)/blink',
+            '<(blink_core_output_dir)',
           ],
         },
         {
           'action_name': 'EventTargetNames',
           'inputs': [
             '<@(make_names_files)',
             'events/EventTargetFactory.in',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/EventTargetNames.cpp',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/EventTargetNames.h',
+            '<(blink_core_output_dir)/EventTargetNames.cpp',
+            '<(blink_core_output_dir)/EventTargetNames.h',
           ],
           'action': [
             'python',
             '../build/scripts/make_names.py',
             'events/EventTargetFactory.in',
             '--output_dir',
-            '<(SHARED_INTERMEDIATE_DIR)/blink',
+            '<(blink_core_output_dir)',
           ],
         },
         {
           'action_name': 'MathMLNames',
           'inputs': [
             '<@(make_qualified_names_files)',
             'html/parser/MathMLTagNames.in',
             'html/parser/MathMLAttributeNames.in',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/MathMLNames.cpp',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/MathMLNames.h',
+            '<(blink_core_output_dir)/MathMLNames.cpp',
+            '<(blink_core_output_dir)/MathMLNames.h',
           ],
           'action': [
             'python',
             '../build/scripts/make_qualified_names.py',
             'html/parser/MathMLTagNames.in',
             'html/parser/MathMLAttributeNames.in',
             '--output_dir',
-            '<(SHARED_INTERMEDIATE_DIR)/blink',
+            '<(blink_core_output_dir)',
             '--defines', '<(feature_defines)'
           ],
         },
         {
           'action_name': 'UserAgentStyleSheets',
           'variables': {
             'scripts': [
               'css/make-css-file-arrays.pl',
               '../build/scripts/preprocessor.pm',
             ],
@@ skipping 16 matching lines @@
               'css/fullscreen.css',
               'css/xhtmlmp.css',
               'css/viewportAndroid.css',
             ],
           },
           'inputs': [
             '<@(scripts)',
             '<@(stylesheets)'
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/UserAgentStyleSheets.h',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/UserAgentStyleSheetsData.cpp',
+            '<(blink_core_output_dir)/UserAgentStyleSheets.h',
+            '<(blink_core_output_dir)/UserAgentStyleSheetsData.cpp',
           ],
           'action': [
             'python',
             '../build/scripts/action_useragentstylesheets.py',
             '<@(_outputs)',
             '<@(stylesheets)',
             '--',
             '<@(scripts)',
             '--',
             '--defines', '<(feature_defines)',
             '<@(preprocessor)',
             '--perl', '<(perl_exe)',
           ],
         },
         {
           'action_name': 'FetchInitiatorTypeNames',
           'inputs': [
             '<@(make_names_files)',
             'fetch/FetchInitiatorTypeNames.in',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/FetchInitiatorTypeNames.cpp',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/FetchInitiatorTypeNames.h',
+            '<(blink_core_output_dir)/FetchInitiatorTypeNames.cpp',
+            '<(blink_core_output_dir)/FetchInitiatorTypeNames.h',
           ],
           'action': [
             'python',
             '../build/scripts/make_names.py',
             'fetch/FetchInitiatorTypeNames.in',
             '--output_dir',
-            '<(SHARED_INTERMEDIATE_DIR)/blink',
+            '<(blink_core_output_dir)',
           ],
         },
         {
           'action_name': 'EventTypeNames',
           'inputs': [
             '<@(make_names_files)',
             'events/EventTypeNames.in',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/EventTypeNames.cpp',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/EventTypeNames.h',
+            '<(blink_core_output_dir)/EventTypeNames.cpp',
+            '<(blink_core_output_dir)/EventTypeNames.h',
           ],
           'action': [
             'python',
             '../build/scripts/make_names.py',
             'events/EventTypeNames.in',
             '--output_dir',
-            '<(SHARED_INTERMEDIATE_DIR)/blink',
+            '<(blink_core_output_dir)',
           ],
         },
         {
           'action_name': 'HTMLTokenizerNames',
           'inputs': [
             '<@(make_names_files)',
             'html/parser/HTMLTokenizerNames.in',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/HTMLTokenizerNames.cpp',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/HTMLTokenizerNames.h',
+            '<(blink_core_output_dir)/HTMLTokenizerNames.cpp',
+            '<(blink_core_output_dir)/HTMLTokenizerNames.h',
           ],
           'action': [
             'python',
             '../build/scripts/make_names.py',
             'html/parser/HTMLTokenizerNames.in',
             '--output_dir',
-            '<(SHARED_INTERMEDIATE_DIR)/blink',
+            '<(blink_core_output_dir)',
           ],
         },
         {
           'action_name': 'InputTypeNames',
           'inputs': [
             '<@(make_names_files)',
             'html/forms/InputTypeNames.in',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/InputTypeNames.cpp',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/InputTypeNames.h',
+            '<(blink_core_output_dir)/InputTypeNames.cpp',
+            '<(blink_core_output_dir)/InputTypeNames.h',
           ],
           'action': [
             'python',
             '../build/scripts/make_names.py',
             'html/forms/InputTypeNames.in',
             '--output_dir',
-            '<(SHARED_INTERMEDIATE_DIR)/blink',
+            '<(blink_core_output_dir)',
           ],
         },
         {
           'action_name': 'XLinkNames',
           'inputs': [
             '<@(make_qualified_names_files)',
             'svg/xlinkattrs.in',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/XLinkNames.cpp',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/XLinkNames.h',
+            '<(blink_core_output_dir)/XLinkNames.cpp',
+            '<(blink_core_output_dir)/XLinkNames.h',
           ],
           'action': [
             'python',
             '../build/scripts/make_qualified_names.py',
             'svg/xlinkattrs.in',
             '--output_dir',
-            '<(SHARED_INTERMEDIATE_DIR)/blink',
+            '<(blink_core_output_dir)',
           ],
         },
         {
           'action_name': 'XMLNSNames',
           'inputs': [
             '<@(make_qualified_names_files)',
             'xml/xmlnsattrs.in',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/XMLNSNames.cpp',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/XMLNSNames.h',
+            '<(blink_core_output_dir)/XMLNSNames.cpp',
+            '<(blink_core_output_dir)/XMLNSNames.h',
           ],
           'action': [
             'python',
             '../build/scripts/make_qualified_names.py',
             'xml/xmlnsattrs.in',
             '--output_dir',
-            '<(SHARED_INTERMEDIATE_DIR)/blink',
+            '<(blink_core_output_dir)',
           ],
         },
         {
           'action_name': 'XMLNames',
           'inputs': [
             '<@(make_qualified_names_files)',
             'xml/xmlattrs.in',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/XMLNames.cpp',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/XMLNames.h',
+            '<(blink_core_output_dir)/XMLNames.cpp',
+            '<(blink_core_output_dir)/XMLNames.h',
           ],
           'action': [
             'python',
             '../build/scripts/make_qualified_names.py',
             'xml/xmlattrs.in',
             '--output_dir',
-            '<(SHARED_INTERMEDIATE_DIR)/blink',
+            '<(blink_core_output_dir)',
           ],
         },
         {
           'action_name': 'MakeTokenMatcher',
           'inputs': [
             '<@(scripts_for_in_files)',
             '../build/scripts/make_token_matcher.py',
             '../core/css/CSSTokenizer-in.cpp',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/CSSTokenizer.cpp',
+            '<(blink_core_output_dir)/CSSTokenizer.cpp',
           ],
           'action': [
             'python',
             '../build/scripts/make_token_matcher.py',
             '../core/css/CSSTokenizer-in.cpp',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/CSSTokenizer.cpp',
+            '<(blink_core_output_dir)/CSSTokenizer.cpp',
           ],
         },
         {
           'action_name': 'MakeParser',
           'inputs': [
             '<@(scripts_for_in_files)',
             '../build/scripts/make_token_matcher.py',
             '../core/css/parser/BisonCSSParser-in.cpp',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/BisonCSSParser.cpp',
+            '<(blink_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',
+            '<(blink_core_output_dir)/BisonCSSParser.cpp',
           ],
         },
         {
           'action_name': 'MakeTokenMatcherForViewport',
           'inputs': [
             '<@(scripts_for_in_files)',
             '../build/scripts/make_token_matcher.py',
             '../core/html/HTMLMetaElement-in.cpp',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/HTMLMetaElement.cpp',
+            '<(blink_core_output_dir)/HTMLMetaElement.cpp',
           ],
           'action': [
             'python',
             '../build/scripts/make_token_matcher.py',
             '../core/html/HTMLMetaElement-in.cpp',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/HTMLMetaElement.cpp',
+            '<(blink_core_output_dir)/HTMLMetaElement.cpp',
           ],
         },
         {
           'action_name': 'HTMLElementLookupTrie',
           'inputs': [
             '<@(scripts_for_in_files)',
             '../build/scripts/make_element_lookup_trie.py',
             '../build/scripts/templates/ElementLookupTrie.cpp.tmpl',
             '../build/scripts/templates/ElementLookupTrie.h.tmpl',
             'html/HTMLTagNames.in',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/HTMLElementLookupTrie.cpp',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/HTMLElementLookupTrie.h',
+            '<(blink_core_output_dir)/HTMLElementLookupTrie.cpp',
+            '<(blink_core_output_dir)/HTMLElementLookupTrie.h',
           ],
           'action': [
             'python',
             '../build/scripts/make_element_lookup_trie.py',
             'html/HTMLTagNames.in',
             '--output_dir',
-            '<(SHARED_INTERMEDIATE_DIR)/blink',
+            '<(blink_core_output_dir)',
           ],
         },
       ],
       'rules': [
         {
           'rule_name': 'bison',
           'extension': 'y',
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/<(RULE_INPUT_ROOT).cpp',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/<(RULE_INPUT_ROOT).h'
+            '<(blink_core_output_dir)/<(RULE_INPUT_ROOT).cpp',
+            '<(blink_core_output_dir)/<(RULE_INPUT_ROOT).h'
           ],
           'action': [
             'python',
             '../build/scripts/rule_bison.py',
             '<(RULE_INPUT_PATH)',
-            '<(SHARED_INTERMEDIATE_DIR)/blink',
+            '<(blink_core_output_dir)',
             '<(bison_exe)',
           ],
         },
       ],
     },
   ],
 }