Add a vmservice_sdk directory in runtime/bin.

tools/patch_sdk.dart

 #!/usr/bin/env dart
 // Copyright (c) 2015, 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.
 
 /// Command line tool to merge the SDK libraries and our patch files.
 /// This is currently designed as an offline tool, but we could automate it.
 
 import 'dart:io';
 import 'dart:isolate' show RawReceivePort;
@@ skipping 102 matching lines @@
 
   Uri platform = outDirUri.resolve('platform.dill.tmp');
   Uri outline = outDirUri.resolve('outline.dill');
   Uri librariesJson = outDirUri.resolve("lib/libraries.json");
   Uri packages = Uri.base.resolveUri(new Uri.file(packagesFile));
 
   await _writeSync(
       librariesJson.toFilePath(), JSON.encode({"libraries": locations}));
 
   if (forVm || forFlutter) {
-    var vmserviceName = forVm ? 'vmservice_io' : 'vmservice_sky';
-    var targetName = forVm ? 'vm_fasta' : 'flutter_fasta';
-    Uri vmserviceUri = outDirUri.resolve('$vmserviceName.dill');
     await fasta.compilePlatform(outDirUri, platform,
         packages: packages,
         outlineOutput: outline,
         backendTarget: forVm ? 'vm_fasta' : 'flutter_fasta');
+  } else {
+    await dart2js.compilePlatform(outDirUri, platform,
+        packages: packages, outlineOutput: outline);
+  }
+
+  if (forVm) {
+    var base = path.fromUri(Platform.script);
+    Uri repositoryDir =
+        new Uri.directory(path.dirname(path.dirname(path.absolute(base))));
+    var vmserviceName = 'vmservice_io';
+    Uri vmserviceSdk = repositoryDir.resolve('runtime/bin/vmservice_sdk/');
+    Uri vmserviceUri = outDirUri.resolve('$vmserviceName.dill');
+    // TODO(sigmundch): Specify libraries.json directly instead of "--sdk"
+    // after #29882 is fixed.
     await fasta.compile([
-      "--sdk=$outDirUri",
+      "--sdk=$vmserviceSdk",
       "--platform=$outline",
-      "--target=$targetName",
+      "--target=vm_fasta",
       "--packages=$packages",
       "dart:$vmserviceName",
       "-o",
       "$vmserviceUri",
     ]);
-  } else {
-    await dart2js.compilePlatform(outDirUri, platform,
-        packages: packages, outlineOutput: outline);
   }
 
   Uri platformFinalLocation = outDirUri.resolve('platform.dill');
 
   // We generate a dependency file for GN to properly regenerate the patched sdk
   // folder, outline.dill and platform.dill files when necessary: either when
   // the sdk sources change or when this script is updated. In particular:
   //
   //  - sdk changes: we track the actual sources we are compiling. If we are
   //    building the dart2js sdk, this includes the dart2js-specific patch
@@ skipping 84 matching lines @@
 _copyExtraLibraries(String sdkOut, Map<String, String> locations) {
   if (forDart2js) return;
   var base = path.fromUri(Platform.script);
   var dartDir = path.dirname(path.dirname(path.absolute(base)));
 
   var builtinLibraryIn = path.join(dartDir, 'runtime', 'bin', 'builtin.dart');
   var builtinLibraryOut = path.join(sdkOut, '_builtin', '_builtin.dart');
   _writeSync(builtinLibraryOut, readInputFile(builtinLibraryIn));
   locations['_builtin'] = path.join('_builtin', '_builtin.dart');
 
-  for (var file in ['loader.dart', 'server.dart', 'vmservice_io.dart']) {
-    var libraryIn = path.join(dartDir, 'runtime', 'bin', 'vmservice', file);
-    var libraryOut = path.join(sdkOut, 'vmservice_io', file);
-    _writeSync(libraryOut, readInputFile(libraryIn));
-  }
-
-  locations[forVm ? "vmservice_io" : "vmservice_sky"] =
-      path.join('vmservice_io', 'vmservice_io.dart');
-  locations["_vmservice"] = path.join('vmservice', 'vmservice.dart');
-
   if (forFlutter) {
     // Flutter repo has this layout:
     //  engine/src/
     //       dart/
     //       flutter/
     var srcDir = path.dirname(path.dirname(path.dirname(path.absolute(base))));
     var uiLibraryInDir = path.join(srcDir, 'flutter', 'lib', 'ui');
     for (var file in new Directory(uiLibraryInDir).listSync()) {
       if (!file.path.endsWith('.dart')) continue;
       var name = path.basename(file.path);
@@ skipping 410 matching lines @@
     if (diff != 0) return diff;
     return end - other.end;
   }
 }
 
 List<SdkLibrary> _getSdkLibraries(String contents) {
   var libraryBuilder = new SdkLibrariesReader_LibraryBuilder(forDart2js);
   parseCompilationUnit(contents).accept(libraryBuilder);
   return libraryBuilder.librariesMap.sdkLibraries;
 }