From 3f52f82dec3aa55eaf7b2ba60ee2253a3cf63aa5 Mon Sep 17 00:00:00 2001 From: John McCutchan Date: Wed, 30 Sep 2015 15:22:04 -0700 Subject: [PATCH 1/2] Roll the Dart runtime forward --- DEPS | 6 +++--- engine/src/flutter/sky/tools/sky_snapshot/vm.cc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DEPS b/DEPS index 8fe57add6e9..ccf016a5c74 100644 --- a/DEPS +++ b/DEPS @@ -25,9 +25,9 @@ vars = { # Note: When updating the Dart revision, ensure that all entries that are # dependencies of dart are also updated - 'dart_revision': 'cab003366785773ace16b5305ac1f33c228cac54', - 'dart_observatory_packages_revision': 'cdc4b3d4c15b9c0c8e7702dff127b440afbb7485', - 'dart_root_certificates_revision': 'c3a41df63afacec62fcb8135196177e35fe72f71', + 'dart_revision': '2a9c5c0a91e514e6f0ae1062dafe35434de042ad', + 'dart_observatory_packages_revision': 'a731d3b1caf27b45aecdce9378b87a510240264d', + 'dart_root_certificates_revision': 'a731d3b1caf27b45aecdce9378b87a510240264d', 'buildtools_revision': '5215ee866bc3e8eb4a7f124212845abf4029e60b', } diff --git a/engine/src/flutter/sky/tools/sky_snapshot/vm.cc b/engine/src/flutter/sky/tools/sky_snapshot/vm.cc index 7fc57deeda0..cf3e2aff0ec 100644 --- a/engine/src/flutter/sky/tools/sky_snapshot/vm.cc +++ b/engine/src/flutter/sky/tools/sky_snapshot/vm.cc @@ -21,7 +21,7 @@ void InitDartVM() { CHECK(Dart_SetVMFlags(arraysize(kDartArgs), kDartArgs)); CHECK(Dart_Initialize(blink::kDartVmIsolateSnapshotBuffer, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, - nullptr)); + nullptr, nullptr) == nullptr); } Dart_Isolate CreateDartIsolate() { From be9fb1950fb034f0069c026eeec6624eb270573d Mon Sep 17 00:00:00 2001 From: John McCutchan Date: Thu, 1 Oct 2015 07:23:04 -0700 Subject: [PATCH 2/2] Roll DEPS --- DEPS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index ccf016a5c74..44fe44ebaea 100644 --- a/DEPS +++ b/DEPS @@ -25,9 +25,9 @@ vars = { # Note: When updating the Dart revision, ensure that all entries that are # dependencies of dart are also updated - 'dart_revision': '2a9c5c0a91e514e6f0ae1062dafe35434de042ad', + 'dart_revision': '4b4e836960dfc75f174084ec9233b4516569a38f', 'dart_observatory_packages_revision': 'a731d3b1caf27b45aecdce9378b87a510240264d', - 'dart_root_certificates_revision': 'a731d3b1caf27b45aecdce9378b87a510240264d', + 'dart_root_certificates_revision': 'c3a41df63afacec62fcb8135196177e35fe72f71', 'buildtools_revision': '5215ee866bc3e8eb4a7f124212845abf4029e60b', }