Roll Dart and set dart_runtime_mode in the GN script (#2610)

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',
 

sky/engine/config.gni

@@ -28,8 +28,6 @@ declare_args() {
   } else {
     sky_dart_strict_mode = false
   }
-
-  flutter_develop_mode = false
 }
 
 # feature_defines_list ---------------------------------------------------------
@@ -58,7 +56,3 @@ if (sky_dart_strict_mode) {
 if (sky_use_dart) {
   feature_defines_list += [ "WTF_USE_DART=1" ]
 }
-
-if (flutter_develop_mode) {
-  feature_defines_list += [ "FLUTTER_DEVELOP_MODE=1" ]
-}

sky/engine/core/core.gni

@@ -199,6 +199,8 @@ sky_core_files = [
   "rendering/style/StyleVisualData.h",
   "script/dart_controller.cc",
   "script/dart_controller.h",
+  "script/dart_debugger.cc",
+  "script/dart_debugger.h",
   "script/dart_init.cc",
   "script/dart_init.h",
   "script/dart_service_isolate.cc",
@@ -218,13 +220,6 @@ sky_core_files = [
   "window/window.h",
 ]
 
-if (flutter_develop_mode) {
-  sky_core_files += [
-    "script/dart_debugger.cc",
-    "script/dart_debugger.h",
-  ]
-}
-
 core_dart_files = get_path_info([
                                   "dart/compositing.dart",
                                   "dart/hash_codes.dart",

sky/engine/core/script/dart_init.cc

@@ -329,14 +329,6 @@ bool IsRunningPrecompiledCode() {
 
 #endif  // DART_ALLOW_DYNAMIC_RESOLUTION
 
-bool IsDevelopMode() {
-#ifdef FLUTTER_DEVELOP_MODE
-  return true;
-#else
-  return false;
-#endif
-}
-
 static base::LazyInstance<std::unique_ptr<EmbedderTracingCallbacks>>::Leaky
     g_tracing_callbacks = LAZY_INSTANCE_INITIALIZER;
 
@@ -388,7 +380,7 @@ void InitDartVM() {
   enable_checked_mode = true;
 #endif
 
-  if (IsRunningPrecompiledCode() || !IsDevelopMode()) {
+  if (IsRunningPrecompiledCode()) {
     enable_checked_mode = false;
   }
 
@@ -399,11 +391,9 @@ void InitDartVM() {
     // The version of the VM setup to run precompiled code does not recognize
     // the mirrors or the background compilation flags. They are never enabled.
     // Make sure we dont pass in unrecognized flags.
-    if (IsDevelopMode()) {
-      args.append(kDartMirrorsArgs, arraysize(kDartMirrorsArgs));
-      args.append(kDartBackgroundCompilationArgs,
-                  arraysize(kDartBackgroundCompilationArgs));
-    }
+    args.append(kDartMirrorsArgs, arraysize(kDartMirrorsArgs));
+    args.append(kDartBackgroundCompilationArgs,
+                arraysize(kDartBackgroundCompilationArgs));
   } else {
     args.append(kDartPrecompilationArgs, arraysize(kDartPrecompilationArgs));
   }
@@ -437,13 +427,11 @@ void InitDartVM() {
   }
   CHECK(Dart_SetVMFlags(args.size(), args.data()));
 
-#ifdef FLUTTER_DEVELOP_MODE
   {
     TRACE_EVENT0("flutter", "DartDebugger::InitDebugger");
     // This should be called before calling Dart_Initialize.
     DartDebugger::InitDebugger();
   }
-#endif
 
   DartUI::InitForGlobal();
 #ifdef OS_ANDROID

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
 

sky/tools/sky_snapshot/BUILD.gn

@@ -34,8 +34,4 @@ executable("sky_snapshot") {
       "-lgcc_s",
     ]
   }
-
-  if (flutter_develop_mode) {
-    defines = [ "FLUTTER_DEVELOP_MODE=1" ]
-  }
 }

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",
 };