Roll Dart to 3ee0a42 (flutter#4378)

esarbanis · Nov 21, 2017 · 5f9c852 · 5f9c852
1 parent 5c6ebf7
commit 5f9c852
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/DEPS b/DEPS
@@ -31,7 +31,7 @@ vars = {
   # Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': '4dd4fd745e588eef64b8d85811d847ab72633cb7',
+  'dart_revision': 'bb33ba10d6a4a52d164c5e3deb169232b07f0bf0',
 
   'dart_args_tag': '0.13.7',
   'dart_async_tag': '2.0.0',
@@ -56,7 +56,7 @@ vars = {
   'dart_http_parser_tag': '3.1.1',
   'dart_http_tag': '0.11.3+14',
   'dart_http_throttle_tag': '1.0.1',
-  'dart_intl_tag': '0.15.1',
+  'dart_intl_tag': '0.15.2',
   'dart_isolate_tag': '1.1.0',
   'dart_json_rpc_2_tag': '2.0.4',
   'dart_linter_tag': '0.1.39',

diff --git a/build/flutter_app.gni b/build/flutter_app.gni
@@ -257,7 +257,7 @@ template("flutter_aot_app") {
       "--url-mapping",
       "dart:mozart.internal," + rebase_path(mozart_dart_sdk_ext_lib),
       "--url-mapping",
-      "dart:vmservice_sky," + rebase_path(
+      "dart:vmservice_io," + rebase_path(
               "$dart_root_gen_dir/dart-pkg/sky_engine/sdk_ext/vmservice_io.dart"),
 
       "--entry-points-manifest",

diff --git a/runtime/dart_service_isolate.cc b/runtime/dart_service_isolate.cc
@@ -125,7 +125,7 @@ bool DartServiceIsolate::Startup(std::string server_ip,
     result = Dart_FinalizeLoading(false);
     SHUTDOWN_ON_ERROR(result);
   } else {
-    Dart_Handle uri = Dart_NewStringFromCString("dart:vmservice_sky");
+    Dart_Handle uri = Dart_NewStringFromCString("dart:vmservice_io");
     Dart_Handle library = Dart_LookupLibrary(uri);
     SHUTDOWN_ON_ERROR(library);
     result = Dart_SetRootLibrary(library);
@@ -187,7 +187,7 @@ Dart_Handle DartServiceIsolate::GetSource(const char* name) {
 }
 
 Dart_Handle DartServiceIsolate::LoadScript(const char* name) {
-  Dart_Handle url = Dart_NewStringFromCString("dart:vmservice_sky");
+  Dart_Handle url = Dart_NewStringFromCString("dart:vmservice_io");
   Dart_Handle source = GetSource(name);
   return Dart_LoadScript(url, Dart_Null(), source, 0, 0);
 }

diff --git a/runtime/dart_vm_entry_points.txt b/runtime/dart_vm_entry_points.txt
@@ -36,4 +36,4 @@ dart:ui,SemanticsUpdate,SemanticsUpdate.
 dart:ui,SemanticsUpdateBuilder,SemanticsUpdateBuilder.
 dart:ui,Shader,Shader.
 dart:ui,TextBox,TextBox._
-dart:vmservice_sky,::,main
+dart:vmservice_io,::,main
diff --git a/travis/licenses_golden/licenses_third_party b/travis/licenses_golden/licenses_third_party
@@ -1,4 +1,4 @@
-Signature: 81d843c63b1b3c56e86219402e32eb78
+Signature: a4c565121c4fd07173a7e4985a3d989c
 
 UNUSED LICENSES:
 
@@ -4965,7 +4965,6 @@ FILE: ../../../third_party/dart/runtime/vm/virtual_memory_fuchsia.cc
 FILE: ../../../third_party/dart/sdk/lib/developer/service.dart
 FILE: ../../../third_party/dart/sdk/lib/js_util/dart2js/js_util_dart2js.dart
 FILE: ../../../third_party/dart/sdk/lib/vmservice/devfs.dart
-FILE: ../../../third_party/dart/utils/kernel-service/kernel-service.dart
 ----------------------------------------------------------------------------------------------------
 Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 for details. All rights reserved.