Commit d313feb0 authored by Todd Volkert's avatar Todd Volkert Committed by GitHub

Point to updated location of snapshot.dart (#5375)

parent 9a0a0d99
...@@ -117,12 +117,13 @@ Future<String> _buildAotSnapshot( ...@@ -117,12 +117,13 @@ Future<String> _buildAotSnapshot(
return null; return null;
} }
String entryPointsDir, dartEntryPointsDir, genSnapshot; String entryPointsDir, dartEntryPointsDir, snapshotterDir, genSnapshot;
String engineSrc = tools.engineSrcPath; String engineSrc = tools.engineSrcPath;
if (engineSrc != null) { if (engineSrc != null) {
entryPointsDir = path.join(engineSrc, 'flutter', 'sky', 'engine', 'bindings'); entryPointsDir = path.join(engineSrc, 'flutter', 'sky', 'engine', 'bindings');
dartEntryPointsDir = path.join(engineSrc, 'dart', 'runtime', 'bin'); dartEntryPointsDir = path.join(engineSrc, 'dart', 'runtime', 'bin');
snapshotterDir = path.join(engineSrc, 'flutter', 'lib', 'snapshot');
String engineOut = tools.getEngineArtifactsDirectory(platform, buildMode).path; String engineOut = tools.getEngineArtifactsDirectory(platform, buildMode).path;
if (platform == TargetPlatform.ios) { if (platform == TargetPlatform.ios) {
genSnapshot = path.join(engineOut, 'clang_x64', 'gen_snapshot'); genSnapshot = path.join(engineOut, 'clang_x64', 'gen_snapshot');
...@@ -134,6 +135,7 @@ Future<String> _buildAotSnapshot( ...@@ -134,6 +135,7 @@ Future<String> _buildAotSnapshot(
String artifactsDir = tools.getEngineArtifactsDirectory(platform, buildMode).path; String artifactsDir = tools.getEngineArtifactsDirectory(platform, buildMode).path;
entryPointsDir = artifactsDir; entryPointsDir = artifactsDir;
dartEntryPointsDir = entryPointsDir; dartEntryPointsDir = entryPointsDir;
snapshotterDir = entryPointsDir;
if (platform == TargetPlatform.ios) { if (platform == TargetPlatform.ios) {
genSnapshot = path.join(artifactsDir, 'gen_snapshot'); genSnapshot = path.join(artifactsDir, 'gen_snapshot');
} else { } else {
...@@ -194,7 +196,7 @@ Future<String> _buildAotSnapshot( ...@@ -194,7 +196,7 @@ Future<String> _buildAotSnapshot(
]); ]);
break; break;
case TargetPlatform.ios: case TargetPlatform.ios:
snapshotDartIOS = path.join(entryPointsDir, 'snapshot.dart'); snapshotDartIOS = path.join(snapshotterDir, 'snapshot.dart');
assembly = path.join(outputDir.path, 'snapshot_assembly.S'); assembly = path.join(outputDir.path, 'snapshot_assembly.S');
filePaths.addAll(<String>[ filePaths.addAll(<String>[
snapshotDartIOS, snapshotDartIOS,
......
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