Go back to using dart_bootstrap for precompilation bots

tools/testing/dart/compiler_configuration.dart

 // Copyright (c) 2014, 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.
 
 library compiler_configuration;
 
-import 'dart:io' show Directory, Platform;
+import 'dart:io' show Platform;
 
 import 'runtime_configuration.dart' show RuntimeConfiguration;
 
 import 'test_runner.dart' show Command, CommandBuilder, CompilationCommand;
 
 import 'test_suite.dart' show TestInformation, TestUtils;
 
 /// Grouping of a command with its expected result.
 class CommandArtifact {
   final List<Command> commands;
@@ skipping 22 matching lines @@
   // TODO(ahe): Remove this constructor and move the switch to
   // test_options.dart.  We probably want to store an instance of
   // [CompilerConfiguration] in [configuration] there.
   factory CompilerConfiguration(Map configuration) {
     String compiler = configuration['compiler'];
 
     // TODO(ahe): Move these booleans into a struction configuration object
     // which can eventually completely replace the Map-based configuration
     // object.
     bool isDebug = configuration['mode'] == 'debug';
-    bool isProduct = configuration['mode'] == 'product';
     bool isChecked = configuration['checked'];
     bool isHostChecked = configuration['host_checked'];
     bool useSdk = configuration['use_sdk'];
     bool isCsp = configuration['csp'];
     bool useCps = configuration['cps_ir'];
 
     switch (compiler) {
       case 'dart2analyzer':
         return new AnalyzerCompilerConfiguration(
             isDebug: isDebug,
@@ skipping 10 matching lines @@
             isCsp: isCsp,
             extraDart2jsOptions:
                 TestUtils.getExtraOptions(configuration, 'dart2js_options'));
       case 'dart2app':
         return new Dart2AppSnapshotCompilerConfiguration(
             isDebug: isDebug, isChecked: isChecked);
       case 'precompiler':
         return new PrecompilerCompilerConfiguration(
             isDebug: isDebug,
             isChecked: isChecked,
-            isProduct: isProduct,
             arch: configuration['arch']);
       case 'none':
         return new NoneCompilerConfiguration(
             isDebug: isDebug,
             isChecked: isChecked,
             isHostChecked: isHostChecked,
             useSdk: useSdk);
       default:
         throw "Unknown compiler '$compiler'";
     }
@@ skipping 202 matching lines @@
         : nativeDirectoryToUri(TestUtils.dartDir.toNativePath())
             .resolve('sdk/');
     Uri preambleDir = sdk.resolve('lib/_internal/js_runtime/lib/preambles/');
     return runtimeConfiguration.dart2jsPreambles(preambleDir)
       ..add(artifact.filename);
   }
 }
 
 class PrecompilerCompilerConfiguration extends CompilerConfiguration {
   final String arch;
-  final bool isProduct;
 
-  PrecompilerCompilerConfiguration(
-      {bool isDebug, bool isChecked, bool isProduct, String arch})
+  PrecompilerCompilerConfiguration({bool isDebug, bool isChecked, String arch})
       : super._subclass(isDebug: isDebug, isChecked: isChecked),
-        isProduct = isProduct,
         arch = arch;
 
   int computeTimeoutMultiplier() {
     int multiplier = 2;
     if (isDebug) multiplier *= 4;
     if (isChecked) multiplier *= 2;
     return multiplier;
   }
 
   CommandArtifact computeCompilationArtifact(
@@ skipping 11 matching lines @@
           CommandBuilder.instance, arguments, environmentOverrides)
     ], '$tempDir', 'application/dart-precompiled');
   }
 
   CompilationCommand computeCompilationCommand(
       String tempDir,
       String buildDir,
       CommandBuilder commandBuilder,
       List arguments,
       Map<String, String> environmentOverrides) {
-    var sourceDir = Directory.current.path;
-    var exec = "$buildDir/gen_snapshot";
+    var exec = "$buildDir/dart_bootstrap";
     var args = new List();
-
-    var precompiledVMIsolate = "$tempDir/precompiled.vmisolate";
-    var precompiledIsolate = "$tempDir/precompiled.isolate";
-    var precompiledInstructions = "$tempDir/precompiled.S";
-    var dartProductEntries = "$sourceDir/runtime/bin/dart_product_entries.txt";
-    var dartEntries = "$sourceDir/runtime/bin/dart_entries.txt";
-    var vmServiceIoMain = "$sourceDir/runtime/bin/vmservice/vmservice_io.dart";
-
-    args.add("--embedder_entry_points_manifest=$dartProductEntries");
-    if (!isProduct) {
-      args.add("--embedder_entry_points_manifest=$dartEntries");
-    }
-    args.add("--vm_isolate_snapshot=$precompiledVMIsolate");
-    args.add("--isolate_snapshot=$precompiledIsolate");
-    args.add("--instructions_snapshot=$precompiledInstructions");
-    args.add("--url_mapping=dart:vmservice_io,$vmServiceIoMain");
+    args.add("--gen-precompiled-snapshot=$tempDir");
     args.addAll(arguments);
 
     return commandBuilder.getCompilationCommand('precompiler', tempDir, !useSdk,
         bootstrapDependencies(buildDir), exec, args, environmentOverrides);
   }
 
   CompilationCommand computeAssembleCommand(
       String tempDir,
       String buildDir,
       CommandBuilder commandBuilder,
@@ skipping 240 matching lines @@
       RuntimeConfiguration runtimeConfiguration,
       String buildDir,
       TestInformation info,
       List<String> vmOptions,
       List<String> sharedOptions,
       List<String> originalArguments,
       CommandArtifact artifact) {
     return <String>[];
   }
 }