Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Unified Diff: tools/testing/dart/compiler_configuration.dart

Issue 2405393002: Use a single file for app snapshots. (Closed)
Patch Set: gen_snapshot Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/snapshot.cc ('k') | tools/testing/dart/runtime_configuration.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/testing/dart/compiler_configuration.dart
diff --git a/tools/testing/dart/compiler_configuration.dart b/tools/testing/dart/compiler_configuration.dart
index d0e6f5f444ad02c68cd67c3c56f7e8c084c9c4ad..6cada5b21c9342eb8a4686011569fb12d3951ea8 100644
--- a/tools/testing/dart/compiler_configuration.dart
+++ b/tools/testing/dart/compiler_configuration.dart
@@ -369,10 +369,12 @@ class PrecompilerCompilerConfiguration extends CompilerConfiguration {
Map<String, String> environmentOverrides) {
var exec = "$buildDir/dart_bootstrap";
var args = new List();
- args.add("--snapshot=$tempDir");
args.add("--snapshot-kind=app-aot");
if (useBlobs) {
+ args.add("--snapshot=$tempDir/out.aotsnapshot");
args.add("--use-blobs");
+ } else {
+ args.add("--snapshot=$tempDir/out.S");
}
if (isAndroid && arch == 'arm') {
args.add('--no-sim-use-hardfp');
@@ -390,15 +392,13 @@ class PrecompilerCompilerConfiguration extends CompilerConfiguration {
List arguments,
Map<String, String> environmentOverrides) {
- var cc, shared, libname;
+ var cc, shared;
if (Platform.isLinux) {
cc = 'gcc';
shared = '-shared';
- libname = 'libprecompiled.so';
} else if (Platform.isMacOS) {
cc = 'clang';
shared = '-dynamiclib';
- libname = 'libprecompiled.dylib';
} else {
throw "Platform not supported: ${Platform.operatingSystem}";
}
@@ -430,8 +430,8 @@ class PrecompilerCompilerConfiguration extends CompilerConfiguration {
var args = (cc_flags != null) ? [ shared, cc_flags ] : [ shared ];
args.addAll([
'-o',
- '$tempDir/$libname',
- '$tempDir/snapshot.S'
+ '$tempDir/out.aotsnapshot',
+ '$tempDir/out.S'
]);
return commandBuilder.getCompilationCommand('assemble', tempDir, !useSdk,
@@ -447,7 +447,7 @@ class PrecompilerCompilerConfiguration extends CompilerConfiguration {
List arguments,
Map<String, String> environmentOverrides) {
var exec = 'rm';
- var args = ['$tempDir/snapshot.S'];
+ var args = ['$tempDir/out.S'];
return commandBuilder.getCompilationCommand(
'remove_assembly',
@@ -532,7 +532,7 @@ class Dart2AppSnapshotCompilerConfiguration extends CompilerConfiguration {
Map<String, String> environmentOverrides) {
var exec = "$buildDir/dart_bootstrap";
var args = new List();
- args.add("--snapshot=$tempDir");
+ args.add("--snapshot=$tempDir/out.jitsnapshot");
args.add("--snapshot-kind=app-after-run");
args.addAll(arguments);
@@ -592,7 +592,7 @@ class Dart2AppJitSnapshotCompilerConfiguration extends Dart2AppSnapshotCompilerC
Map<String, String> environmentOverrides) {
var exec = "$buildDir/dart";
var args = new List();
- args.add("--snapshot=$tempDir");
+ args.add("--snapshot=$tempDir/out.jitsnapshot");
args.add("--snapshot-kind=app-jit-after-run");
if (useBlobs) {
args.add("--use-blobs");
« no previous file with comments | « runtime/vm/snapshot.cc ('k') | tools/testing/dart/runtime_configuration.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698