From 2c070363c2ecb970555d1c41401db503d86ac98a Mon Sep 17 00:00:00 2001
From: shrike69 <35853497+shrike69@users.noreply.github.com>
Date: Wed, 11 Jul 2018 08:49:57 -0700
Subject: [PATCH] Use binary name to locate .packages file on Fuchsia (#19217)

---
 .../lib/src/commands/fuchsia_reload.dart             | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/flutter_tools/lib/src/commands/fuchsia_reload.dart b/packages/flutter_tools/lib/src/commands/fuchsia_reload.dart
index 17723c5275..9b52118659 100644
--- a/packages/flutter_tools/lib/src/commands/fuchsia_reload.dart
+++ b/packages/flutter_tools/lib/src/commands/fuchsia_reload.dart
@@ -326,11 +326,6 @@ class FuchsiaReloadCommand extends FlutterCommand {
     if (!_fileExists(_target))
       throwToolExit('Couldn\'t find application entry point at $_target.');
 
-    final String packagesFileName = '${_projectName}_dart_library.packages';
-    _dotPackagesPath = '$_buildDir/dartlang/gen/$_projectRoot/$packagesFileName';
-    if (!_fileExists(_dotPackagesPath))
-      throwToolExit('Couldn\'t find .packages file at $_dotPackagesPath.');
-
     final String nameOverride = argResults['name-override'];
     if (nameOverride == null) {
       _binaryName = _projectName;
@@ -338,6 +333,13 @@ class FuchsiaReloadCommand extends FlutterCommand {
       _binaryName = nameOverride;
     }
 
+    // When there's an override of the on-device binary name, use that name
+    // to locate the .packages file.
+    final String packagesFileName = '${_binaryName}_dart_library.packages';
+    _dotPackagesPath = '$_buildDir/dartlang/gen/$_projectRoot/$packagesFileName';
+    if (!_fileExists(_dotPackagesPath))
+      throwToolExit('Couldn\'t find .packages file at $_dotPackagesPath.');
+
     final String isolateNumber = argResults['isolate-number'];
     if (isolateNumber == null) {
       _isolateNumber = '';