Add 'flutter_release' patch_sdk mode to patch_sdk

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 56 matching lines @@
       path.join(repositoryDir, 'out', 'DebugX64', 'obj', 'gen', 'patch'));
   final outExample = path.relative(
       path.join(repositoryDir, 'out', 'DebugX64', 'obj', 'gen', 'patched_sdk'));
   final packagesExample = path.relative(path.join(repositoryDir, '.packages'));
   print('For example:');
   print('\$ $self vm $sdkExample $patchExample $outExample $packagesExample');
 
   exit(1);
 }
 
-const validModes = const ['vm', 'dart2js', 'flutter'];
+const validModes = const ['vm', 'dart2js', 'flutter', 'flutter_release'];
 String mode;
 bool get forVm => mode == 'vm';
-bool get forFlutter => mode == 'flutter';
+bool get forFlutter => mode == 'flutter' || mode == 'flutter_release';
+bool get forFlutterRelease => mode == 'flutter_release';
 bool get forDart2js => mode == 'dart2js';
 
 Future _main(List<String> argv) async {
   if (argv.isEmpty) usage('[${validModes.join('|')}]');
   mode = argv.first;
   if (!validModes.contains(mode)) usage('[${validModes.join('|')}]');
   if (argv.length != 5) usage(mode);
 
   var input = argv[1];
   var sdkLibIn = path.join(input, 'lib');
@@ skipping 25 matching lines @@
   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) {
     await fasta.compilePlatform(outDirUri, platform,
         packages: packages,
         outlineOutput: outline,
-        backendTarget: forVm ? 'vm_fasta' : 'flutter_fasta');
+        backendTarget: forVm
+            ? 'vm_fasta'
+            : forFlutterRelease ? 'flutter_fasta_release' : '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';

[Siggi Cherem (dart-lang), 2017/07/10 17:29:57]

I thought instead we would compile vmservice_sky here.

[aam, 2017/07/10 22:11:37]

Yeah, something like that make sense, yet somehow for Flutter debug mode it
works without vmservice_sky.dill. I need to look further into this, sync up with
SivaB on that.

     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=$vmserviceSdk",
       "--platform=$outline",
       "--target=vm_fasta",
       "--packages=$packages",
       "dart:$vmserviceName",
@@ skipping 72 matching lines @@
   ''');
 
   if (forFlutter) {
     extraLibraries.write('''
       "ui": const LibraryInfo(
           "ui/ui.dart",
           categories: "Client,Server",
           implementation: true,
           documented: false,
           platforms: VM_PLATFORM),
+
     ''');
+
+    if (!forFlutterRelease) {
+      // vmservice should be present unless we build release flavor of Flutter.
+      extraLibraries.write('''
+       "_vmservice": const LibraryInfo(
+           "vmservice/vmservice.dart",
+           categories: "Client,Server",
+           implementation: true,
+           documented: false,
+           platforms: VM_PLATFORM),
+
+        "vmservice_sky": const LibraryInfo(
+            "vmservice_sky/vmservice_io.dart",
+            categories: "Client,Server",
+            implementation: true,
+            documented: false,
+            platforms: VM_PLATFORM),
+
+      ''');
+    }
   }
 
   libContents = libContents.replaceAll(
       ' libraries = const {', ' libraries = const { $extraLibraries');
   _writeSync(
       path.join(
           sdkOut, '_internal', 'sdk_library_metadata', 'lib', 'libraries.dart'),
       libContents);
   return libContents;
 }
@@ skipping 18 matching lines @@
     //       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);
       var uiLibraryOut = path.join(sdkOut, 'ui', name);
       _writeSync(uiLibraryOut, readInputFile(file.path));
     }
     locations['ui'] = 'ui/ui.dart';
+
+    if (!forFlutterRelease) {
+      // vmservice should be present unless we build release flavor of Flutter.
+      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['vmservice_sky'] =
+          path.join('vmservice_io', 'vmservice_io.dart');
+      locations['_vmservice'] = path.join('vmservice', 'vmservice.dart');
+    }
   }
 }
 
 _applyPatch(SdkLibrary library, String sdkLibIn, String patchIn, String sdkOut,
     Map<String, String> locations) {
   var libraryOut = path.join(sdkLibIn, library.path);
   var libraryIn = libraryOut;
 
   var libraryFile = getInputFile(libraryIn, canBeMissing: true);
   if (libraryFile != null) {
@@ skipping 396 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;
 }