| Index: runtime/vm/vm.gypi
 | 
| diff --git a/runtime/vm/vm.gypi b/runtime/vm/vm.gypi
 | 
| index cc45491c817ee7c1501ccbd4b0d8c9e92a0b4e57..0fb1bd9ad32cdf40db16bcd33b382b99bf6c2854 100644
 | 
| --- a/runtime/vm/vm.gypi
 | 
| +++ b/runtime/vm/vm.gypi
 | 
| @@ -7,8 +7,6 @@
 | 
|      'builtin_in_cc_file': '../bin/builtin_in.cc',
 | 
|      'corelib_cc_file': '<(SHARED_INTERMEDIATE_DIR)/corelib_gen.cc',
 | 
|      'corelib_patch_cc_file': '<(SHARED_INTERMEDIATE_DIR)/corelib_patch_gen.cc',
 | 
| -    'corelib_impl_cc_file': '<(SHARED_INTERMEDIATE_DIR)/corelib_impl_gen.cc',
 | 
| -    'corelib_impl_patch_cc_file': '<(SHARED_INTERMEDIATE_DIR)/corelib_impl_patch_gen.cc',
 | 
|      'collection_cc_file': '<(SHARED_INTERMEDIATE_DIR)/collection_gen.cc',
 | 
|      'math_cc_file': '<(SHARED_INTERMEDIATE_DIR)/math_gen.cc',
 | 
|      'math_patch_cc_file': '<(SHARED_INTERMEDIATE_DIR)/math_patch_gen.cc',
 | 
| @@ -67,8 +65,6 @@
 | 
|        'dependencies': [
 | 
|          'generate_corelib_cc_file',
 | 
|          'generate_corelib_patch_cc_file',
 | 
| -        'generate_corelib_impl_cc_file',
 | 
| -        'generate_corelib_impl_patch_cc_file',
 | 
|          'generate_collection_cc_file',
 | 
|          'generate_math_cc_file',
 | 
|          'generate_math_patch_cc_file',
 | 
| @@ -81,7 +77,6 @@
 | 
|        ],
 | 
|        'includes': [
 | 
|          '../lib/lib_sources.gypi',
 | 
| -        '../lib/lib_impl_sources.gypi',
 | 
|          '../lib/isolate_sources.gypi',
 | 
|          '../lib/mirrors_sources.gypi',
 | 
|          '../lib/scalarlist_sources.gypi',
 | 
| @@ -91,8 +86,6 @@
 | 
|          # Include generated source files.
 | 
|          '<(corelib_cc_file)',
 | 
|          '<(corelib_patch_cc_file)',
 | 
| -        '<(corelib_impl_cc_file)',
 | 
| -        '<(corelib_impl_patch_cc_file)',
 | 
|          '<(collection_cc_file)',
 | 
|          '<(math_cc_file)',
 | 
|          '<(math_patch_cc_file)',
 | 
| @@ -112,7 +105,6 @@
 | 
|        'type': 'static_library',
 | 
|        'includes': [
 | 
|          '../lib/lib_sources.gypi',
 | 
| -        '../lib/lib_impl_sources.gypi',
 | 
|          '../lib/isolate_sources.gypi',
 | 
|          '../lib/mirrors_sources.gypi',
 | 
|          '../lib/scalarlist_sources.gypi',
 | 
| @@ -201,82 +193,6 @@
 | 
|        ]
 | 
|      },
 | 
|      {
 | 
| -      'target_name': 'generate_corelib_impl_cc_file',
 | 
| -      'type': 'none',
 | 
| -      'includes': [
 | 
| -        # Load the shared core library sources.
 | 
| -        '../../sdk/lib/coreimpl/corelib_impl_sources.gypi',
 | 
| -      ],
 | 
| -      'sources/': [
 | 
| -        # Exclude all .[cc|h] files.
 | 
| -        # This is only here for reference. Excludes happen after
 | 
| -        # variable expansion, so the script has to do its own
 | 
| -        # exclude processing of the sources being passed.
 | 
| -        ['exclude', '\\.cc|h$'],
 | 
| -      ],
 | 
| -      'actions': [
 | 
| -        {
 | 
| -          'action_name': 'generate_corelib_impl_cc',
 | 
| -          'inputs': [
 | 
| -            '../tools/create_string_literal.py',
 | 
| -            '<(builtin_in_cc_file)',
 | 
| -            '<@(_sources)',
 | 
| -          ],
 | 
| -          'outputs': [
 | 
| -            '<(corelib_impl_cc_file)',
 | 
| -          ],
 | 
| -          'action': [
 | 
| -            'python',
 | 
| -            'tools/create_string_literal.py',
 | 
| -            '--output', '<(corelib_impl_cc_file)',
 | 
| -            '--input_cc', '<(builtin_in_cc_file)',
 | 
| -            '--include', 'vm/bootstrap.h',
 | 
| -            '--var_name', 'dart::Bootstrap::corelib_impl_source_',
 | 
| -            '<@(_sources)',
 | 
| -          ],
 | 
| -          'message': 'Generating ''<(corelib_impl_cc_file)'' file.'
 | 
| -        },
 | 
| -      ]
 | 
| -    },
 | 
| -    {
 | 
| -      'target_name': 'generate_corelib_impl_patch_cc_file',
 | 
| -      'type': 'none',
 | 
| -      'includes': [
 | 
| -        # Load the runtime implementation sources.
 | 
| -        '../lib/lib_impl_sources.gypi',
 | 
| -      ],
 | 
| -      'sources/': [
 | 
| -        # Exclude all .[cc|h] files.
 | 
| -        # This is only here for reference. Excludes happen after
 | 
| -        # variable expansion, so the script has to do its own
 | 
| -        # exclude processing of the sources being passed.
 | 
| -        ['exclude', '\\.cc|h$'],
 | 
| -      ],
 | 
| -      'actions': [
 | 
| -        {
 | 
| -          'action_name': 'generate_corelib_impl_patch_cc',
 | 
| -          'inputs': [
 | 
| -            '../tools/create_string_literal.py',
 | 
| -            '<(builtin_in_cc_file)',
 | 
| -            '<@(_sources)',
 | 
| -          ],
 | 
| -          'outputs': [
 | 
| -            '<(corelib_impl_patch_cc_file)',
 | 
| -          ],
 | 
| -          'action': [
 | 
| -            'python',
 | 
| -            'tools/create_string_literal.py',
 | 
| -            '--output', '<(corelib_impl_patch_cc_file)',
 | 
| -            '--input_cc', '<(builtin_in_cc_file)',
 | 
| -            '--include', 'vm/bootstrap.h',
 | 
| -            '--var_name', 'dart::Bootstrap::corelib_impl_patch_',
 | 
| -            '<@(_sources)',
 | 
| -          ],
 | 
| -          'message': 'Generating ''<(corelib_impl_patch_cc_file)'' file.'
 | 
| -        },
 | 
| -      ]
 | 
| -    },
 | 
| -    {
 | 
|        'target_name': 'generate_collection_cc_file',
 | 
|        'type': 'none',
 | 
|        'includes': [
 | 
| 
 |