From b3dd19dc8f6a46cfa37467ad22b46a813622eea4 Mon Sep 17 00:00:00 2001
From: Jason Simmons <jason-simmons@users.noreply.github.com>
Date: Fri, 22 Apr 2016 11:02:41 -0700
Subject: [PATCH] Roll Dart and set dart_runtime_mode in the GN script (#2610)

---
 DEPS                                               | 2 +-
 engine/src/flutter/sky/tools/gn                    | 9 +++++++--
 engine/src/flutter/sky/tools/sky_snapshot/BUILD.gn | 4 ----
 engine/src/flutter/sky/tools/sky_snapshot/vm.cc    | 2 --
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/DEPS b/DEPS
index c2a2982cfe9..edee533ada9 100644
--- a/DEPS
+++ b/DEPS
@@ -25,7 +25,7 @@ vars = {
 
   # Note: When updating the Dart revision, ensure that all entries that are
   # dependencies of dart are also updated
-  'dart_revision': 'ccfd19bfd775c7cfc400aeda2c08fd821616cc82',
+  'dart_revision': '36e2c86d14aed0ba08a41dabbaa89b88add1a423',
   'dart_observatory_packages_revision': 'cf90eb9077177d3d6b3fd5e8289477c2385c026a',
   'dart_root_certificates_revision': 'aed07942ce98507d2be28cbd29e879525410c7fc',
 
diff --git a/engine/src/flutter/sky/tools/gn b/engine/src/flutter/sky/tools/gn
index d8d0604b444..fbf34ee32ae 100755
--- a/engine/src/flutter/sky/tools/gn
+++ b/engine/src/flutter/sky/tools/gn
@@ -48,7 +48,13 @@ def to_gn_args(args):
 
     gn_args['is_debug'] = args.debug
     gn_args['is_clang'] = args.clang and args.target_os not in ['android', 'fnl']
-    gn_args['flutter_develop_mode'] = args.develop
+
+    if args.develop:
+        gn_args['dart_runtime_mode'] = 'develop'
+    elif args.debug:
+        gn_args['dart_runtime_mode'] = 'profile'
+    else:
+        gn_args['dart_runtime_mode'] = 'release'
 
     ios_target_cpu = 'arm64'
     if args.ios_force_armv7:
@@ -107,7 +113,6 @@ def to_gn_args(args):
     gn_args['enable_gcm'] = args.enable_gcm
     gn_args['enable_google_sign_in'] = args.enable_google_sign_in
     gn_args['use_glfw'] = args.use_glfw
-    gn_args['dart_product'] = not args.develop
 
     return gn_args
 
diff --git a/engine/src/flutter/sky/tools/sky_snapshot/BUILD.gn b/engine/src/flutter/sky/tools/sky_snapshot/BUILD.gn
index 44b1dc0c9e7..b87eb314dca 100644
--- a/engine/src/flutter/sky/tools/sky_snapshot/BUILD.gn
+++ b/engine/src/flutter/sky/tools/sky_snapshot/BUILD.gn
@@ -34,8 +34,4 @@ executable("sky_snapshot") {
       "-lgcc_s",
     ]
   }
-
-  if (flutter_develop_mode) {
-    defines = [ "FLUTTER_DEVELOP_MODE=1" ]
-  }
 }
diff --git a/engine/src/flutter/sky/tools/sky_snapshot/vm.cc b/engine/src/flutter/sky/tools/sky_snapshot/vm.cc
index a2ee68fe86a..f7cb9f9f8f6 100644
--- a/engine/src/flutter/sky/tools/sky_snapshot/vm.cc
+++ b/engine/src/flutter/sky/tools/sky_snapshot/vm.cc
@@ -14,10 +14,8 @@ extern void* kDartIsolateSnapshotBuffer;
 }
 
 static const char* kDartArgs[] = {
-#ifdef FLUTTER_DEVELOP_MODE
     "--enable_mirrors=false",
     "--load_deferred_eagerly=true",
-#endif
     "--conditional_directives",
 };