Revert "Turn the VM's dart:typed_data into a patch"

runtime/vm/vm.gypi

 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 {
   'variables': {
     'gen_source_dir': '<(SHARED_INTERMEDIATE_DIR)',
     'libgen_in_cc_file': '../lib/libgen_in.cc',
     'builtin_in_cc_file': '../bin/builtin_in.cc',
     'async_cc_file': '<(gen_source_dir)/async_gen.cc',
@@ skipping 12 matching lines @@
     'isolate_patch_cc_file': '<(gen_source_dir)/isolate_patch_gen.cc',
     'math_cc_file': '<(gen_source_dir)/math_gen.cc',
     'math_patch_cc_file': '<(gen_source_dir)/math_patch_gen.cc',
     'mirrors_cc_file': '<(gen_source_dir)/mirrors_gen.cc',
     'mirrors_patch_cc_file': '<(gen_source_dir)/mirrors_patch_gen.cc',
     'profiler_cc_file': '<(gen_source_dir)/profiler_gen.cc',
     'snapshot_test_dat_file': '<(gen_source_dir)/snapshot_test.dat',
     'snapshot_test_in_dat_file': 'snapshot_test_in.dat',
     'snapshot_test_dart_file': 'snapshot_test.dart',
     'typed_data_cc_file': '<(gen_source_dir)/typed_data_gen.cc',
-    'typed_data_patch_cc_file': '<(gen_source_dir)/typed_data_patch_gen.cc',
     'vmservice_cc_file': '<(gen_source_dir)/vmservice_gen.cc',
     'vmservice_patch_cc_file': '<(gen_source_dir)/vmservice_patch_gen.cc',
   },
   'targets': [
     {
       'target_name': 'libdart_vm',
       'type': 'static_library',
       'toolsets':['host', 'target'],
       'includes': [
         'vm_sources.gypi',
@@ skipping 183 matching lines @@
         'generate_internal_cc_file#host',
         'generate_internal_patch_cc_file#host',
         'generate_isolate_cc_file#host',
         'generate_isolate_patch_cc_file#host',
         'generate_math_cc_file#host',
         'generate_math_patch_cc_file#host',
         'generate_mirrors_cc_file#host',
         'generate_mirrors_patch_cc_file#host',
         'generate_profiler_cc_file#host',
         'generate_typed_data_cc_file#host',
-        'generate_typed_data_patch_cc_file#host',
         'generate_vmservice_cc_file#host',
         'generate_vmservice_patch_cc_file#host',
       ],
       'includes': [
         '../lib/async_sources.gypi',
         '../lib/collection_sources.gypi',
         '../lib/core_sources.gypi',
         '../lib/developer_sources.gypi',
         '../lib/internal_sources.gypi',
         '../lib/isolate_sources.gypi',
@@ skipping 18 matching lines @@
         '<(internal_cc_file)',
         '<(internal_patch_cc_file)',
         '<(isolate_cc_file)',
         '<(isolate_patch_cc_file)',
         '<(math_cc_file)',
         '<(math_patch_cc_file)',
         '<(mirrors_cc_file)',
         '<(mirrors_patch_cc_file)',
         '<(profiler_cc_file)',
         '<(typed_data_cc_file)',
-        '<(typed_data_patch_cc_file)',
         '<(vmservice_cc_file)',
         '<(vmservice_patch_cc_file)',
       ],
       'include_dirs': [
         '..',
       ],
     },
     {
       'target_name': 'libdart_lib',
       'type': 'static_library',
@@ skipping 676 matching lines @@
             '--include', 'vm/bootstrap.h',
             '--var_name', 'dart::Bootstrap::mirrors_patch_paths_',
             '--library_name', 'dart:mirrors',
             '<@(_sources)',
           ],
           'message': 'Generating ''<(mirrors_patch_cc_file)'' file.'
         },
       ]
     },
     {
+      # Unlike the other libraries in the SDK, dart:typed_data is not
+      # implemented as a patch applied to the base SDK implementation.
+      # Instead the VM has a complete replacement library and the
+      # implementation in the SDK is ignored.
       'target_name': 'generate_typed_data_cc_file',
       'type': 'none',
       'toolsets':['host'],
       'includes': [
         # Load the runtime implementation sources.
-        '../../sdk/lib/typed_data/typed_data_sources.gypi',
+        '../lib/typed_data_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': [
         {
@@ skipping 14 matching lines @@
             '--include', 'vm/bootstrap.h',
             '--var_name', 'dart::Bootstrap::typed_data_source_paths_',
             '--library_name', 'dart:typed_data',
             '<@(_sources)',
           ],
           'message': 'Generating ''<(typed_data_cc_file)'' file.'
         },
       ]
     },
     {
-      'target_name': 'generate_typed_data_patch_cc_file',
-      'type': 'none',
-      'toolsets':['host'],
-      'includes': [
-        # Load the patch sources.
-        '../lib/typed_data_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_typed_data_patch_cc',
-          'inputs': [
-            '../tools/gen_library_src_paths.py',
-            '<(libgen_in_cc_file)',
-            '<@(_sources)',
-          ],
-          'outputs': [
-            '<(typed_data_patch_cc_file)',
-          ],
-          'action': [
-            'python',
-            'tools/gen_library_src_paths.py',
-            '--output', '<(typed_data_patch_cc_file)',
-            '--input_cc', '<(libgen_in_cc_file)',
-            '--include', 'vm/bootstrap.h',
-            '--var_name', 'dart::Bootstrap::typed_data_patch_paths_',
-            '--library_name', 'dart:typed_data',
-            '<@(_sources)',
-          ],
-          'message': 'Generating ''<(typed_data_patch_cc_file)'' file.'
-        },
-      ]
-    },
-    {
       'target_name': 'generate_profiler_cc_file',
       'type': 'none',
       'toolsets':['host'],
       'includes': [
         # Load the shared library sources.
         '../../sdk/lib/profiler/profiler_sources.gypi',
       ],
       'sources/': [
         # Exclude all .[cc|h] files.
         # This is only here for reference. Excludes happen after
@@ skipping 224 matching lines @@
         'generate_collection_library_patch',
         'generate_convert_library_patch',
         'generate_core_library_patch',
         'generate_developer_library_patch',
         'generate_internal_library_patch',
         'generate_io_library_patch',
         'generate_isolate_library_patch',
         'generate_math_library_patch',
         'generate_mirrors_library_patch',
         'generate_profiler_library_patch',
-        'generate_typed_data_library_patch',
         'generate_vmservice_library_patch',
       ],
       'actions': [
         {
           'action_name': 'patch_sdk',
           'inputs': [
             '<!@(["python", "../tools/list_files.py", "relative",'
                   '"dart$", "sdk/lib"])',
             '../../tools/patch_sdk.py',
             '../../tools/patch_sdk.dart',
+            # Unlike the other libraries in the SDK, dart:typed_data is not
+            # implemented as a patch applied to the base SDK implementation.
+            # Instead the VM has a complete replacement library and the
+            # implementation in the SDK is ignored.
+            '../lib/typed_data.dart',
             # Unlike the other libraries in the SDK, dart:_builtin and
             # dart:nativewrappers are only available for the Dart VM.
             '../bin/builtin.dart',
             '../bin/vmservice/vmservice_io.dart',
             '../bin/vmservice/loader.dart',
             '../bin/vmservice/server.dart',
             '<(gen_source_dir)/patches/async_patch.dart',
             '<(gen_source_dir)/patches/collection_patch.dart',
             '<(gen_source_dir)/patches/convert_patch.dart',
             '<(gen_source_dir)/patches/core_patch.dart',
             '<(gen_source_dir)/patches/developer_patch.dart',
             '<(gen_source_dir)/patches/internal_patch.dart',
             '<(gen_source_dir)/patches/io_patch.dart',
             '<(gen_source_dir)/patches/isolate_patch.dart',
             '<(gen_source_dir)/patches/math_patch.dart',
             '<(gen_source_dir)/patches/mirrors_patch.dart',
             '<(gen_source_dir)/patches/profiler_patch.dart',
-            '<(gen_source_dir)/patches/typed_data_patch.dart',
             '<(gen_source_dir)/patches/vmservice_patch.dart',
           ],
           'outputs': [
             # Instead of listing all outputs we list a single well-known one.
             '<(PRODUCT_DIR)/patched_sdk/lib/core/core.dart',
           ],
           'action': [
             'python',
             '../tools/patch_sdk.py',
             '--dart-executable',
@@ skipping 353 matching lines @@
             '--output',
             '<(gen_source_dir)/patches/<(library_name)_patch.dart',
             '<@(_sources)',
           ],
           'message': 'Generating <(library_uri) patch.',
         },
       ],
     },
     {
       'variables': {
-        'library_name': 'typed_data',
-        'library_uri': 'dart:typed_data',
-      },
-      'target_name': 'generate_<(library_name)_library_patch',
-      'type': 'none',
-      'toolsets': ['host'],
-      'includes': [
-        '../lib/typed_data_sources.gypi',
-      ],
-      'actions': [
-        {
-          'action_name': 'concatenate_<(library_name)_patches',
-          'inputs': [
-            '../tools/concatenate_patches.py',
-            '<@(_sources)',
-          ],
-          'outputs': [
-            '<(gen_source_dir)/patches/<(library_name)_patch.dart'
-          ],
-          'action': [
-            'python',
-            'tools/concatenate_patches.py',
-            '--output',
-            '<(gen_source_dir)/patches/<(library_name)_patch.dart',
-            '<@(_sources)',
-          ],
-          'message': 'Generating <(library_uri) patch.',
-        },
-      ],
-    },
-    {
-      'variables': {
         'library_name': 'vmservice',
         'library_uri': 'dart:_vmservice',
       },
       'target_name': 'generate_<(library_name)_library_patch',
       'type': 'none',
       'toolsets': ['host'],
       'includes': [
         '../lib/vmservice_sources.gypi',
       ],
       'actions': [
@@ skipping 12 matching lines @@
             '--output',
             '<(gen_source_dir)/patches/<(library_name)_patch.dart',
             '<@(_sources)',
           ],
           'message': 'Generating <(library_uri) patch.',
         },
       ],
     },
   ]
 }