From d313feb0276580bdb10760388e06b5ce568d5802 Mon Sep 17 00:00:00 2001
From: Todd Volkert <tvolkert@users.noreply.github.com>
Date: Fri, 12 Aug 2016 15:08:32 -0700
Subject: [PATCH] Point to updated location of snapshot.dart (#5375)

---
 packages/flutter_tools/lib/src/commands/build_aot.dart | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/flutter_tools/lib/src/commands/build_aot.dart b/packages/flutter_tools/lib/src/commands/build_aot.dart
index ea8df6b2df4..8530c224453 100644
--- a/packages/flutter_tools/lib/src/commands/build_aot.dart
+++ b/packages/flutter_tools/lib/src/commands/build_aot.dart
@@ -117,12 +117,13 @@ Future<String> _buildAotSnapshot(
     return null;
   }
 
-  String entryPointsDir, dartEntryPointsDir, genSnapshot;
+  String entryPointsDir, dartEntryPointsDir, snapshotterDir, genSnapshot;
 
   String engineSrc = tools.engineSrcPath;
   if (engineSrc != null) {
     entryPointsDir  = path.join(engineSrc, 'flutter', 'sky', 'engine', 'bindings');
     dartEntryPointsDir = path.join(engineSrc, 'dart', 'runtime', 'bin');
+    snapshotterDir = path.join(engineSrc, 'flutter', 'lib', 'snapshot');
     String engineOut = tools.getEngineArtifactsDirectory(platform, buildMode).path;
     if (platform == TargetPlatform.ios) {
       genSnapshot = path.join(engineOut, 'clang_x64', 'gen_snapshot');
@@ -134,6 +135,7 @@ Future<String> _buildAotSnapshot(
     String artifactsDir = tools.getEngineArtifactsDirectory(platform, buildMode).path;
     entryPointsDir = artifactsDir;
     dartEntryPointsDir = entryPointsDir;
+    snapshotterDir = entryPointsDir;
     if (platform == TargetPlatform.ios) {
       genSnapshot = path.join(artifactsDir, 'gen_snapshot');
     } else {
@@ -194,7 +196,7 @@ Future<String> _buildAotSnapshot(
       ]);
       break;
     case TargetPlatform.ios:
-      snapshotDartIOS = path.join(entryPointsDir, 'snapshot.dart');
+      snapshotDartIOS = path.join(snapshotterDir, 'snapshot.dart');
       assembly = path.join(outputDir.path, 'snapshot_assembly.S');
       filePaths.addAll(<String>[
         snapshotDartIOS,