Revert "Add support for building patched_sdk and platform.dill for dart2js:"

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;
 import 'dart:async';
 import 'dart:math' as math;
 
 import 'package:analyzer/analyzer.dart';
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:path/path.dart' as path;
 
-import 'package:front_end/src/fasta/fasta.dart' as fasta
+import 'package:front_end/src/fasta/fasta.dart'
     show compilePlatform, writeDepsFile;
 
-import 'package:compiler/src/kernel/fasta_support.dart' as dart2js
-    show compilePlatform;
-
 /// Set of input files that were read by this script to generate patched SDK.
 /// We will dump it out into the depfile for ninja to use.
 ///
 /// For more information see GN and Ninja references:
 ///    https://chromium.googlesource.com/chromium/src/+/56807c6cb383140af0c03da8f6731d77785d7160/tools/gn/docs/reference.md#depfile_string_File-name-for-input-dependencies-for-actions
 ///    https://ninja-build.org/manual.html#_depfile
 ///
 final deps = new Set<Uri>();
 
 /// Create [File] object from the given path and register it as a dependency.
@@ skipping 14 matching lines @@
 
 Future main(List<String> argv) async {
   var port = new RawReceivePort();
   try {
     await _main(argv);
   } finally {
     port.close();
   }
 }
 
-void usage(String mode) {
+Future _main(List<String> argv) async {
   var base = path.fromUri(Platform.script);
-  final self = path.relative(base);
-  print('Usage: $self $mode SDK_DIR PATCH_DIR OUTPUT_DIR PACKAGES');
+  var dartDir = path.dirname(path.dirname(path.absolute(base)));
 
-  final repositoryDir = path.relative(path.dirname(path.dirname(base)));
-  final sdkExample = path.relative(path.join(repositoryDir, 'sdk'));
-  final patchExample = path.relative(
-      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');
+  if (argv.length != 5 || argv.first != 'vm') {
+    final self = path.relative(base);
+    print('Usage: $self vm SDK_DIR PATCH_DIR OUTPUT_DIR PACKAGES');
 
-  exit(1);
-}
+    final repositoryDir = path.relative(path.dirname(path.dirname(base)));
+    final sdkExample = path.relative(path.join(repositoryDir, 'sdk'));
+    final patchExample = path.relative(
+        path.join(repositoryDir, 'out', 'DebugX64', 'obj', 'gen', 'patch'));
+    final outExample = path.relative(path.join(
+        repositoryDir, 'out', 'DebugX64', 'obj', 'gen', 'patched_sdk'));
+    print('For example:');
+    print('\$ $self vm $sdkExample $patchExample $outExample');
 
-Future _main(List<String> argv) async {
-  var mode = argv.first;
-  if (mode != 'vm' && mode != 'dart2js') usage('[vm|dart2js]');
-  if (argv.length != 5) usage(mode);
+    exit(1);
+  }
 
-  bool forVm = mode == 'vm';
-  bool forDart2js = mode == 'dart2js';
+  var mode = argv[0];
+  assert(mode == "vm");
   var input = argv[1];
   var sdkLibIn = path.join(input, 'lib');
   var patchIn = argv[2];
   var outDir = argv[3];
-  var outDirUri = Uri.base.resolveUri(new Uri.directory(outDir));
   var sdkOut = path.join(outDir, 'lib');
   var packagesFile = argv[4];
 
-  // Parse libraries.dart
+  // Copy and patch libraries.dart and version
   var libContents = readInputFile(path.join(
       sdkLibIn, '_internal', 'sdk_library_metadata', 'lib', 'libraries.dart'));
-  if (forVm) libContents = _updateLibraryMetadata(sdkOut, libContents);
-  var sdkLibraries = _getSdkLibraries(libContents);
-
-  // Enumerate core libraries and apply patches
-  for (SdkLibrary library in sdkLibraries) {
-    if (forDart2js && library.isVmLibrary) continue;
-    if (forVm && library.isDart2JsLibrary) continue;
-    _applyPatch(library, sdkLibIn, patchIn, sdkOut);
-  }
-
-  if (forVm) _copyExtraVmLibraries(sdkOut);
-
-  Uri platform = outDirUri.resolve('platform.dill.tmp');
-  Uri packages = Uri.base.resolveUri(new Uri.file(packagesFile));
-  if (forVm) {
-    await fasta.compilePlatform(outDirUri, platform, packages: packages);
-  } else {
-    await dart2js.compilePlatform(outDirUri, platform, packages: packages);
-  }
-
-  Uri platformFinalLocation = outDirUri.resolve('platform.dill');
-
-  // To properly regenerate the patched_sdk, patched_dart2js_sdk, and
-  // platform.dill only when necessary, we track dependencies as follows:
-  //  - inputs like the sdk libraries and patch files are covered by the
-  //    extraDependencies argument.
-  //  - this script and its script dependencies are handled by writeDepsFile
-  //    here.
-  //  - the internal platform libraries that may affect how this script
-  //    runs in the VM are discovered by providing the `platform` argument
-  //    below. Regardless of patched_sdk or patched_dart2js_sdk we provide below
-  //    the .dill file of patched_sdk (since the script runs in the VM and not
-  //    in dart2js). At the BUILD.gn level we have a dependency from
-  //    patched_dart2js_sdk to patched_sdk to ensure that file already exists.
-  await fasta.writeDepsFile(Platform.script,
-      Uri.base.resolveUri(new Uri.file("$outDir.d")), platformFinalLocation,
-      packages: packages,
-      platform:
-          forVm ? platform : outDirUri.resolve('../patched_sdk/platform.dill'),
-      extraDependencies: deps,
-      verbose: false);
-
-  await new File.fromUri(platform).rename(platformFinalLocation.toFilePath());
-}
-
-/// Updates the contents of
-/// sdk/lib/_internal/sdk_library_metadata/lib/libraries.dart to include
-/// declarations for vm internal libraries.
-String _updateLibraryMetadata(String sdkOut, String libContents) {
-  // Copy and patch libraries.dart and version
   libContents = libContents.replaceAll(
       ' libraries = const {',
       ''' libraries = const {
 
   "_builtin": const LibraryInfo(
       "_builtin/_builtin.dart",
       categories: "Client,Server",
       implementation: true,
       documented: false,
       platforms: VM_PLATFORM),
@@ skipping 13 matching lines @@
       "vmservice_io/vmservice_io.dart",
       implementation: true,
       documented: false,
       platforms: VM_PLATFORM),
 
 ''');
   _writeSync(
       path.join(
           sdkOut, '_internal', 'sdk_library_metadata', 'lib', 'libraries.dart'),
       libContents);
-  return libContents;
-}
 
-/// Copy internal libraries that are developed under 'runtime/bin/' to the
-/// patched_sdk folder.
-_copyExtraVmLibraries(String sdkOut) {
-  var base = path.fromUri(Platform.script);
-  var dartDir = path.dirname(path.dirname(path.absolute(base)));
+  // Parse libraries.dart
+  var sdkLibraries = _getSdkLibraries(libContents);
+
+  // Enumerate core libraries and apply patches
+  for (SdkLibrary library in sdkLibraries) {
+    if (library.isDart2JsLibrary) {
+      continue;
+    }
+
+    var libraryOut = path.join(sdkLibIn, library.path);
+    var libraryIn = libraryOut;
+
+    var libraryFile = getInputFile(libraryIn, canBeMissing: true);
+    if (libraryFile != null) {
+      var outPaths = <String>[libraryOut];
+      var libraryContents = libraryFile.readAsStringSync();
+
+      int inputModifyTime =
+          libraryFile.lastModifiedSync().millisecondsSinceEpoch;
+      var partFiles = <File>[];
+      for (var part in parseDirectives(libraryContents).directives) {
+        if (part is PartDirective) {
+          var partPath = part.uri.stringValue;
+          outPaths.add(path.join(path.dirname(libraryOut), partPath));
+
+          var partFile =
+              getInputFile(path.join(path.dirname(libraryIn), partPath));
+          partFiles.add(partFile);
+          inputModifyTime = math.max(inputModifyTime,
+              partFile.lastModifiedSync().millisecondsSinceEpoch);
+        }
+      }
+
+      // See if we can find a patch file.
+      var patchPath = path.join(
+          patchIn, path.basenameWithoutExtension(libraryIn) + '_patch.dart');
+
+      var patchFile = getInputFile(patchPath, canBeMissing: true);
+      if (patchFile != null) {
+        inputModifyTime = math.max(inputModifyTime,
+            patchFile.lastModifiedSync().millisecondsSinceEpoch);
+      }
+
+      // Compute output paths
+      outPaths = outPaths
+          .map((p) => path.join(sdkOut, path.relative(p, from: sdkLibIn)))
+          .toList();
+
+      // Compare output modify time with input modify time.
+      bool needsUpdate = false;
+      for (var outPath in outPaths) {
+        var outFile = new File(outPath);
+        if (!outFile.existsSync() ||
+            outFile.lastModifiedSync().millisecondsSinceEpoch <
+                inputModifyTime) {
+          needsUpdate = true;
+          break;
+        }
+      }
+
+      if (needsUpdate) {
+        var contents = <String>[libraryContents];
+        contents.addAll(partFiles.map((f) => f.readAsStringSync()));
+        if (patchFile != null) {
+          var patchContents = patchFile.readAsStringSync();
+          contents = _patchLibrary(patchFile.path, contents, patchContents);
+        }
+
+        for (var i = 0; i < outPaths.length; i++) {
+          _writeSync(outPaths[i], contents[i]);
+        }
+      }
+    }
+  }
 
   for (var tuple in [
     ['_builtin', 'builtin.dart']
   ]) {
     var vmLibrary = tuple[0];
     var dartFile = tuple[1];
 
     // The "dart:_builtin" library is only available for the DartVM.
     var builtinLibraryIn = path.join(dartDir, 'runtime', 'bin', dartFile);
     var builtinLibraryOut = path.join(sdkOut, vmLibrary, '${vmLibrary}.dart');
     _writeSync(builtinLibraryOut, readInputFile(builtinLibraryIn));
   }
 
   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));
   }
-}
 
-_applyPatch(
-    SdkLibrary library, String sdkLibIn, String patchIn, String sdkOut) {
-  var libraryOut = path.join(sdkLibIn, library.path);
-  var libraryIn = libraryOut;
+  Uri platform = Uri.base
+      .resolveUri(new Uri.directory(outDir).resolve('platform.dill.tmp'));
+  Uri packages = Uri.base.resolveUri(new Uri.file(packagesFile));
+  await compilePlatform(
+      Uri.base.resolveUri(new Uri.directory(outDir)), platform,
+      packages: packages, verbose: false);
 
-  var libraryFile = getInputFile(libraryIn, canBeMissing: true);
-  if (libraryFile != null) {
-    var outPaths = <String>[libraryOut];
-    var libraryContents = libraryFile.readAsStringSync();
+  Uri platformFinalLocation =
+      Uri.base.resolveUri(new Uri.directory(outDir).resolve('platform.dill'));
 
-    int inputModifyTime = libraryFile.lastModifiedSync().millisecondsSinceEpoch;
-    var partFiles = <File>[];
-    for (var part in parseDirectives(libraryContents).directives) {
-      if (part is PartDirective) {
-        var partPath = part.uri.stringValue;
-        outPaths.add(path.join(path.dirname(libraryOut), partPath));
+  await writeDepsFile(Platform.script,
+      Uri.base.resolveUri(new Uri.file("$outDir.d")), platformFinalLocation,
+      packages: packages,
+      platform: platform,
+      extraDependencies: deps,
+      verbose: false);
 
-        var partFile =
-            getInputFile(path.join(path.dirname(libraryIn), partPath));
-        partFiles.add(partFile);
-        inputModifyTime = math.max(inputModifyTime,
-            partFile.lastModifiedSync().millisecondsSinceEpoch);
-      }
-    }
-
-    // See if we can find a patch file.
-    var patchPath = path.join(
-        patchIn, path.basenameWithoutExtension(libraryIn) + '_patch.dart');
-
-    var patchFile = getInputFile(patchPath, canBeMissing: true);
-    if (patchFile != null) {
-      inputModifyTime = math.max(
-          inputModifyTime, patchFile.lastModifiedSync().millisecondsSinceEpoch);
-    }
-
-    // Compute output paths
-    outPaths = outPaths
-        .map((p) => path.join(sdkOut, path.relative(p, from: sdkLibIn)))
-        .toList();
-
-    // Compare output modify time with input modify time.
-    bool needsUpdate = false;
-    for (var outPath in outPaths) {
-      var outFile = new File(outPath);
-      if (!outFile.existsSync() ||
-          outFile.lastModifiedSync().millisecondsSinceEpoch < inputModifyTime) {
-        needsUpdate = true;
-        break;
-      }
-    }
-
-    if (needsUpdate) {
-      var contents = <String>[libraryContents];
-      contents.addAll(partFiles.map((f) => f.readAsStringSync()));
-      if (patchFile != null) {
-        var patchContents = patchFile.readAsStringSync();
-        contents = _patchLibrary(patchFile.path, contents, patchContents);
-      }
-
-      for (var i = 0; i < outPaths.length; i++) {
-        _writeSync(outPaths[i], contents[i]);
-      }
-    }
-  }
+  await new File.fromUri(platform).rename(platformFinalLocation.toFilePath());
 }
 
 /// Writes a file, creating the directory if needed.
 void _writeSync(String filePath, String contents) {
   var outDir = new Directory(path.dirname(filePath));
   if (!outDir.existsSync()) outDir.createSync(recursive: true);
 
   new File(filePath).writeAsStringSync(contents);
 }
 
@@ skipping 327 matching lines @@
     if (diff != 0) return diff;
     return end - other.end;
   }
 }
 
 List<SdkLibrary> _getSdkLibraries(String contents) {
   var libraryBuilder = new SdkLibrariesReader_LibraryBuilder(true);
   parseCompilationUnit(contents).accept(libraryBuilder);
   return libraryBuilder.librariesMap.sdkLibraries;
 }