commit 231061c15aedce846fb1fe7e161ca519dfeac0ea
author Stevie Strickland <sstrickl@google.com> Mon Mar 18 16:18:55 2019 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Mon Mar 18 16:18:55 2019 +0000
tree e6d250abaa87d0c105bf19fd9eaddb4cf545cc83
parent 1ea717f1c9b94208c707f84d638df63cc400385a

[gardening] Moving patch to be based on dart hash.

Change-Id: I220a3be123d976d8de062deea6c48003d8521f72
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/97119
Auto-Submit: Stevie Strickland <sstrickl@google.com>
Reviewed-by: Stevie Strickland <sstrickl@google.com>
Reviewed-by: Martin Kustermann <kustermann@google.com>
Commit-Queue: Stevie Strickland <sstrickl@google.com>

tools/patches/flutter-engine/7418238239f885ba92093c44a1768f8ec93b121f.flutter.patch

diff --git a/tools/patches/flutter-flutter/cad97fe7467c60de645d47acffd0e00cd83178ab.patch b/tools/patches/flutter-engine/7418238239f885ba92093c44a1768f8ec93b121f.flutter.patch
similarity index 97%
rename from tools/patches/flutter-flutter/cad97fe7467c60de645d47acffd0e00cd83178ab.patch
rename to tools/patches/flutter-engine/7418238239f885ba92093c44a1768f8ec93b121f.flutter.patch
index 6cc2a6b..958f83a 100644
--- a/tools/patches/flutter-flutter/cad97fe7467c60de645d47acffd0e00cd83178ab.patch
+++ b/tools/patches/flutter-engine/7418238239f885ba92093c44a1768f8ec93b121f.flutter.patch
@@ -151,10 +151,10 @@
  
    String _mapFilename(String filename, PackageUriMapper packageUriMapper) {
 diff --git a/packages/flutter_tools/lib/src/devfs.dart b/packages/flutter_tools/lib/src/devfs.dart
-index 7940e8bb0..9e8b9bd45 100644
+index 407a51b12..ea63e73c6 100644
 --- a/packages/flutter_tools/lib/src/devfs.dart
 +++ b/packages/flutter_tools/lib/src/devfs.dart
-@@ -557,6 +557,8 @@ class DevFS {
+@@ -484,6 +484,8 @@ class DevFS {
        outputPath:  dillOutputPath ?? getDefaultApplicationKernelPath(trackWidgetCreation: trackWidgetCreation),
        packagesFilePath : _packagesFilePath,
      );
@@ -164,10 +164,10 @@
      // started loading from.
      if (!bundleFirstUpload) {
 diff --git a/packages/flutter_tools/test/src/mocks.dart b/packages/flutter_tools/test/src/mocks.dart
-index 52c5fc907..36d63f2d5 100644
+index 42c9d8f7f..c47b4ff7c 100644
 --- a/packages/flutter_tools/test/src/mocks.dart
 +++ b/packages/flutter_tools/test/src/mocks.dart
-@@ -496,6 +496,6 @@ class MockResidentCompiler extends BasicMock implements ResidentCompiler {
+@@ -490,6 +490,6 @@ class MockResidentCompiler extends BasicMock implements ResidentCompiler {
    Future<CompilerOutput> recompile(String mainPath, List<String> invalidatedFiles, { String outputPath, String packagesFilePath }) async {
      fs.file(outputPath).createSync(recursive: true);
      fs.file(outputPath).writeAsStringSync('compiled_kernel_output');