Unverified Commit 3aa72cc2 authored by sjindel-google's avatar sjindel-google Committed by GitHub

Use ELF for AOT snapshots on Fuchsia. (#50468)

parent d3e1e293
...@@ -85,10 +85,7 @@ Future<void> _genSnapshot( ...@@ -85,10 +85,7 @@ Future<void> _genSnapshot(
final String appName = fuchsiaProject.project.manifest.appName; final String appName = fuchsiaProject.project.manifest.appName;
final String dilPath = globals.fs.path.join(outDir, '$appName.dil'); final String dilPath = globals.fs.path.join(outDir, '$appName.dil');
final String vmSnapshotData = globals.fs.path.join(outDir, 'vm_data.aotsnapshot'); final String elf = globals.fs.path.join(outDir, 'elf.aotsnapshot');
final String vmSnapshotInstructions = globals.fs.path.join(outDir, 'vm_instructions.aotsnapshot');
final String snapshotData = globals.fs.path.join(outDir, 'data.aotsnapshot');
final String snapshotInstructions = globals.fs.path.join(outDir, 'instructions.aotsnapshot');
final String genSnapshot = globals.artifacts.getArtifactPath( final String genSnapshot = globals.artifacts.getArtifactPath(
Artifact.genSnapshot, Artifact.genSnapshot,
...@@ -101,11 +98,8 @@ Future<void> _genSnapshot( ...@@ -101,11 +98,8 @@ Future<void> _genSnapshot(
'--no-causal-async-stacks', '--no-causal-async-stacks',
'--lazy-async-stacks', '--lazy-async-stacks',
'--deterministic', '--deterministic',
'--snapshot_kind=app-aot-blobs', '--snapshot_kind=app-aot-elf',
'--vm_snapshot_data=$vmSnapshotData', '--elf=$elf',
'--vm_snapshot_instructions=$vmSnapshotInstructions',
'--isolate_snapshot_data=$snapshotData',
'--isolate_snapshot_instructions=$snapshotInstructions',
if (buildInfo.isDebug) '--enable-asserts', if (buildInfo.isDebug) '--enable-asserts',
dilPath, dilPath,
]; ];
...@@ -213,21 +207,9 @@ Future<void> _buildPackage( ...@@ -213,21 +207,9 @@ Future<void> _buildPackage(
final File manifestFile = globals.fs.file(packageManifest); final File manifestFile = globals.fs.file(packageManifest);
if (buildInfo.usesAot) { if (buildInfo.usesAot) {
final String vmSnapshotData = globals.fs.path.join(outDir, 'vm_data.aotsnapshot'); final String elf = globals.fs.path.join(outDir, 'elf.aotsnapshot');
final String vmSnapshotInstructions = globals.fs.path.join(outDir, 'vm_instructions.aotsnapshot');
final String snapshotData = globals.fs.path.join(outDir, 'data.aotsnapshot');
final String snapshotInstructions = globals.fs.path.join(outDir, 'instructions.aotsnapshot');
manifestFile.writeAsStringSync( manifestFile.writeAsStringSync(
'data/$appName/vm_snapshot_data.bin=$vmSnapshotData\n'); 'data/$appName/app_aot_snapshot.so=$elf\n');
manifestFile.writeAsStringSync(
'data/$appName/vm_snapshot_instructions.bin=$vmSnapshotInstructions\n',
mode: FileMode.append);
manifestFile.writeAsStringSync(
'data/$appName/isolate_snapshot_data.bin=$snapshotData\n',
mode: FileMode.append);
manifestFile.writeAsStringSync(
'data/$appName/isolate_snapshot_instructions.bin=$snapshotInstructions\n',
mode: FileMode.append);
} else { } else {
final String dilpmanifest = globals.fs.path.join(outDir, '$appName.dilpmanifest'); final String dilpmanifest = globals.fs.path.join(outDir, '$appName.dilpmanifest');
manifestFile.writeAsStringSync(globals.fs.file(dilpmanifest).readAsStringSync()); manifestFile.writeAsStringSync(globals.fs.file(dilpmanifest).readAsStringSync());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment