From 9e2a83cfa3312293d45bf5e4548d5fd3571bc438 Mon Sep 17 00:00:00 2001
From: James Robinson <jamesr@chromium.org>
Date: Fri, 25 Sep 2015 16:25:48 -0700
Subject: [PATCH] Fix sky_tools build command to look for package-root in
 global args

---
 packages/flutter_tools/lib/src/build.dart    | 2 +-
 packages/flutter_tools/lib/src/run_mojo.dart | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/flutter_tools/lib/src/build.dart b/packages/flutter_tools/lib/src/build.dart
index f8fa12a13ce..3bef1f40794 100644
--- a/packages/flutter_tools/lib/src/build.dart
+++ b/packages/flutter_tools/lib/src/build.dart
@@ -150,7 +150,7 @@ class BuildCommand extends Command {
     await _compileSnapshot(
       compilerPath: argResults['compiler'],
       mainPath: argResults['main'],
-      packageRoot: argResults['package-root'],
+      packageRoot: globalResults['package-root'],
       snapshotPath: snapshotPath);
     archive.addFile(await _createSnapshotFile(snapshotPath));
 
diff --git a/packages/flutter_tools/lib/src/run_mojo.dart b/packages/flutter_tools/lib/src/run_mojo.dart
index 916de1cd806..f0d185d4d65 100644
--- a/packages/flutter_tools/lib/src/run_mojo.dart
+++ b/packages/flutter_tools/lib/src/run_mojo.dart
@@ -27,7 +27,6 @@ class RunMojoCommand extends Command {
 
     argParser.addOption('app', defaultsTo: 'app.flx');
     argParser.addOption('mojo-path', help: 'Path to directory containing mojo_shell and services');
-    argParser.addOption('package-root', defaultsTo: 'packages');
   }
 
   Future<String> _makePathAbsolute(String relativePath) async {