firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use binary name to locate .packages file on Fuchsia (#19217)

Browse Source
This commit is contained in:
shrike69
2018-07-11 08:49:57 -07:00
committed by GitHub
parent 437731409e
commit 2c070363c2
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/flutter_tools/lib/src/commands/fuchsia_reload.dart
View File

@@ -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 = '';