only pass packages once (#24074)

d04fa1a6 · Jonah Williams · GitHub · a6e90113 · d04fa1a6
Unverified Commit d04fa1a6 authored Nov 08, 2018 by Jonah Williams Committed by GitHub Nov 08, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

compile.dart packages/flutter_tools/lib/src/compile.dart +2 -5

No files found.
--- a/packages/flutter_tools/lib/src/compile.dart
+++ b/packages/flutter_tools/lib/src/compile.dart
@@ -221,8 +221,10 @@ class KernelCompiler {
    if (incrementalCompilerByteStorePath != null) {
      command.add('--incremental');
    }
+    Uri mainUri;
    if (packagesPath != null) {
      command.addAll(<String>['--packages', packagesPath]);
+       mainUri = _PackageUriMapper.findUri(mainPath, packagesPath);
    }
    if (outputFilePath != null) {
      command.addAll(<String>['--output-dill', outputFilePath]);
@@ -242,11 +244,6 @@ class KernelCompiler {
    if (extraFrontEndOptions != null)
      command.addAll(extraFrontEndOptions);
-    Uri mainUri;
-    if (packagesPath != null) {
-      command.addAll(<String>['--packages', packagesPath]);
-      mainUri = _PackageUriMapper.findUri(mainPath, packagesPath);
-    }
    command.add(mainUri?.toString() ?? mainPath);
    printTrace(command.join(' '));