Unify most of our utf8 implementations. This takes the implementation

runtime/bin/bin.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': {
     'io_cc_file': '<(SHARED_INTERMEDIATE_DIR)/io_gen.cc',
     'json_cc_file': '<(SHARED_INTERMEDIATE_DIR)/json_gen.cc',
     'uri_cc_file': '<(SHARED_INTERMEDIATE_DIR)/uri_gen.cc',
-    'utf8_cc_file': '<(SHARED_INTERMEDIATE_DIR)/utf8_gen.cc',
+    'utf_cc_file': '<(SHARED_INTERMEDIATE_DIR)/utf_gen.cc',
     'builtin_in_cc_file': 'builtin_in.cc',
     'builtin_cc_file': '<(SHARED_INTERMEDIATE_DIR)/builtin_gen.cc',
     'snapshot_in_cc_file': 'snapshot_in.cc',
     'snapshot_bin_file': '<(SHARED_INTERMEDIATE_DIR)/snapshot_gen.bin',
     'snapshot_cc_file': '<(SHARED_INTERMEDIATE_DIR)/snapshot_gen.cc',
     'cygwin_dir': '../../third_party/cygwin',
   },
   'targets': [
     {
       'target_name': 'generate_builtin_cc_file',
@@ skipping 129 matching lines @@
             '--input_cc', '<(builtin_in_cc_file)',
             '--include', 'bin/builtin.h',
             '--var_name', 'Builtin::uri_source_',
             '<@(_sources)',
           ],
           'message': 'Generating ''<(uri_cc_file)'' file.'
         },
       ]
     },
     {
-      'target_name': 'generate_utf8_cc_file',
+      'target_name': 'generate_utf_cc_file',
       'type': 'none',
       'conditions': [
         ['OS=="win"', {
           'msvs_cygwin_dirs': ['<(cygwin_dir)'],
         }],
       ],
       'includes': [
-        'utf8_sources.gypi',
+        'utf_sources.gypi',
       ],
       'actions': [
         {
-          'action_name': 'generate_utf8_cc',
+          'action_name': 'generate_utf_cc',
           'inputs': [
             '../tools/create_string_literal.py',
             '<(builtin_in_cc_file)',
             '<@(_sources)',
           ],
           'outputs': [
-            '<(utf8_cc_file)',
+            '<(utf_cc_file)',
           ],
           'action': [
             'python',
             'tools/create_string_literal.py',
-            '--output', '<(utf8_cc_file)',
+            '--output', '<(utf_cc_file)',
             '--input_cc', '<(builtin_in_cc_file)',
             '--include', 'bin/builtin.h',
-            '--var_name', 'Builtin::utf8_source_',
+            '--var_name', 'Builtin::utf_source_',
             '<@(_sources)',
           ],
-          'message': 'Generating ''<(utf8_cc_file)'' file.'
+          'message': 'Generating ''<(utf_cc_file)'' file.'
         },
       ]
     },
     {
       'target_name': 'libdart_builtin',
       'type': 'static_library',
       'dependencies': [
         'generate_builtin_cc_file',
         'generate_io_cc_file',
         'generate_json_cc_file',
         'generate_uri_cc_file',
-        'generate_utf8_cc_file',
+        'generate_utf_cc_file',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'builtin_natives.cc',
         'builtin.h',
       ],
       'includes': [
         'builtin_impl_sources.gypi',
@@ skipping 60 matching lines @@
         '..',
       ],
       'sources': [
         'gen_snapshot.cc',
         'builtin.cc',
         # Include generated source files.
         '<(builtin_cc_file)',
         '<(io_cc_file)',
         '<(json_cc_file)',
         '<(uri_cc_file)',
-        '<(utf8_cc_file)',
+        '<(utf_cc_file)',
       ],
       'conditions': [
         ['OS=="win"', {
           'link_settings': {
             'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib' ],
           },
        }]],
     },
     {
       # Generate snapshot file.
@@ skipping 66 matching lines @@
         '..',
       ],
       'sources': [
         'main.cc',
         'builtin.cc',
         # Include generated source files.
         '<(builtin_cc_file)',
         '<(io_cc_file)',
         '<(json_cc_file)',
         '<(uri_cc_file)',
-        '<(utf8_cc_file)',
+        '<(utf_cc_file)',
         'snapshot_empty.cc',
       ],
       'conditions': [
         ['OS=="win"', {
           'link_settings': {
             'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib' ],
           },
        }]],
     },
     {
@@ skipping 57 matching lines @@
           ],
           'defines': [
             'DART_SHARED_LIB',
           ],
         },
       ],
     }],
   ],
 }