From f1938c60af944a1ce71a94badbcc89a1aeba0646 Mon Sep 17 00:00:00 2001
From: "P.Y. Laligand" <py.laligand@gmail.com>
Date: Tue, 29 Nov 2016 09:57:58 -0800
Subject: [PATCH] Fix building Fuchsia apps. (#7071)

Started failing at 0b737ac57b071df65761f164913ece6db0a85804.
---
 packages/flutter_tools/bin/fuchsia_builder.dart | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/flutter_tools/bin/fuchsia_builder.dart b/packages/flutter_tools/bin/fuchsia_builder.dart
index d68f95d2e47..3fae218fd83 100644
--- a/packages/flutter_tools/bin/fuchsia_builder.dart
+++ b/packages/flutter_tools/bin/fuchsia_builder.dart
@@ -28,8 +28,15 @@ const List<String> _kRequiredOptions = const <String>[
   _kOptionWorking,
 ];
 
-Future<Null> main(List<String> args) async {
-  context[Logger] = new StdoutLogger();
+void main(List<String> args) async {
+  AppContext executableContext = new AppContext();
+  executableContext.runInZone(() {
+    context[Logger] = new StdoutLogger();
+    return run(args);
+  });
+}
+
+Future<Null> run(List<String> args) async {
   final ArgParser parser = new ArgParser()
     ..addOption(_kOptionPackages, help: 'The .packages file')
     ..addOption(_kOptionOutput, help: 'The generated flx file')