| Index: tools/testing/dart/compiler_configuration.dart
|
| diff --git a/tools/testing/dart/compiler_configuration.dart b/tools/testing/dart/compiler_configuration.dart
|
| index bb10b16bbd189d451efecab70553ae4fed2dcaab..77b639c97c6b68b9a697fb14799936ffd7cb1d35 100644
|
| --- a/tools/testing/dart/compiler_configuration.dart
|
| +++ b/tools/testing/dart/compiler_configuration.dart
|
| @@ -12,6 +12,8 @@ import 'test_runner.dart' show Command, CommandBuilder, CompilationCommand;
|
|
|
| import 'test_suite.dart' show TestInformation, TestUtils;
|
|
|
| +import 'runtime_configuration.dart' show DartPrecompiledAdbRuntimeConfiguration;
|
| +
|
| /// Grouping of a command with its expected result.
|
| class CommandArtifact {
|
| final List<Command> commands;
|
| @@ -735,7 +737,13 @@ class PrecompilerCompilerConfiguration extends CompilerConfiguration {
|
| var newOriginalArguments = new List<String>.from(originalArguments);
|
| for (var i = 0; i < newOriginalArguments .length; i++) {
|
| if (newOriginalArguments[i].endsWith(".dart")) {
|
| - newOriginalArguments[i] = "${artifact.filename}/out.aotsnapshot";
|
| + var dir = artifact.filename;
|
| + if (runtimeConfiguration is DartPrecompiledAdbRuntimeConfiguration) {
|
| + // On android the precompiled snapshot will be pushed to a different
|
| + // directory on the device, use that one instead.
|
| + dir = DartPrecompiledAdbRuntimeConfiguration.DeviceTestDir;
|
| + }
|
| + newOriginalArguments[i] = "$dir/out.aotsnapshot";
|
| }
|
| }
|
| return args
|
|
|