Make dart:_vmservice a proper builtin library

runtime/vm/vm.gypi

Index: runtime/vm/vm.gypi
diff --git a/runtime/vm/vm.gypi b/runtime/vm/vm.gypi
index e298592923cd5416811e916a3a6b4d8ca7aa4eef..1ccd0cbfa6165eaa2771d254c226d166132183fb 100644
--- a/runtime/vm/vm.gypi
+++ b/runtime/vm/vm.gypi
@@ -26,30 +26,23 @@
     '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',
-    'service_cc_file': '<(gen_source_dir)/service_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',
   },
   'targets': [
     {
       'target_name': 'libdart_vm',
       'type': 'static_library',
       'toolsets':['host', 'target'],
-      'dependencies': [
-        'generate_service_cc_file#host'
-      ],
       'includes': [
         'vm_sources.gypi',
         '../platform/platform_headers.gypi',
         '../platform/platform_sources.gypi',
       ],
-      'sources': [
-        # Include generated source files.
-        '<(service_cc_file)',
-      ],
       'sources/': [
         # Exclude all _test.[cc|h] files.
         ['exclude', '_test\\.(cc|h)$'],
@@ -105,18 +98,11 @@
       'target_name': 'libdart_vm_nosnapshot',
       'type': 'static_library',
       'toolsets':['host', 'target'],
-      'dependencies': [
-        'generate_service_cc_file#host'
-      ],
       'includes': [
         'vm_sources.gypi',
         '../platform/platform_headers.gypi',
         '../platform/platform_sources.gypi',
       ],
-      'sources': [
-        # Include generated source files.
-        '<(service_cc_file)',
-      ],
       'sources/': [
         # Exclude all _test.[cc|h] files.
         ['exclude', '_test\\.(cc|h)$'],
@@ -197,6 +183,7 @@
         'generate_profiler_cc_file#host',
         'generate_typed_data_cc_file#host',
         'generate_typed_data_patch_cc_file#host',
+        'generate_vmservice_cc_file#host',
       ],
       'includes': [
         '../lib/async_sources.gypi',
@@ -233,6 +220,7 @@
         '<(profiler_cc_file)',
         '<(typed_data_cc_file)',
         '<(typed_data_patch_cc_file)',
+        '<(vmservice_cc_file)',
       ],
       'include_dirs': [
         '..',
@@ -252,6 +240,7 @@
         '../lib/math_sources.gypi',
         '../lib/mirrors_sources.gypi',
         '../lib/typed_data_sources.gypi',
+        '../lib/vmservice_sources.gypi',
       ],
       'sources': [
         'bootstrap_nocore.cc',
@@ -1128,32 +1117,41 @@
       ]
     },
     {
-      'target_name': 'generate_service_cc_file',
+      'target_name': 'generate_vmservice_cc_file',
       'type': 'none',
       'toolsets':['host'],
       'includes': [
-        'service_sources.gypi',
+        '../lib/vmservice_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_service_cc',
+          'action_name': 'generate_vmservice_cc',
           'inputs': [
-            '../tools/create_resources.py',
+            '../tools/gen_library_src_paths.py',
+            '<(libgen_in_cc_file)',
             '<@(_sources)',
           ],
           'outputs': [
-            '<(service_cc_file)',
+            '<(vmservice_cc_file)',
           ],
           'action': [
             'python',
-            'tools/create_resources.py',
-            '--output', '<(service_cc_file)',
-            '--outer_namespace', 'dart',
-            '--table_name', 'service',
-            '--root_prefix', 'vm/service/',
-            '<@(_sources)'
-          ],
-          'message': 'Generating ''<(service_cc_file)'' file.'
+            'tools/gen_library_src_paths.py',
+            '--output', '<(vmservice_cc_file)',
+            '--input_cc', '<(libgen_in_cc_file)',
+            '--include', 'vm/bootstrap.h',
+            '--var_name', 'dart::Bootstrap::vmservice_source_paths_',
+            '--library_name', 'dart:_vmservice',
+            '<@(_sources)',
+          ],
+          'message': 'Generating ''<(vmservice_cc_file)'' file.'
         },
       ]
     },