diff --git a/DEPS b/DEPS index 5ab1ef68378..dfb3033cf2e 100644 --- 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': '011676641a8b4b77bb372384c712709cbf037675', + 'dart_revision': '4c9b71205262699764c5db74e95bc9e702451f4e', 'dart_args_tag': '1.4.1', 'dart_async_tag': '2.0.6', @@ -47,8 +47,8 @@ vars = { 'dart_crypto_tag': '2.0.2+1', 'dart_csslib_tag': '0.14.1', 'dart_dart2js_info_tag': '0.5.6+2', - 'dart_dart_style_tag': '1.0.11', - 'dart_dartdoc_tag': 'v0.18.1', + 'dart_dart_style_tag': '1.0.12', + 'dart_dartdoc_tag': 'v0.19.0', 'dart_fixnum_tag': '0.10.5', 'dart_glob_tag': '1.1.5', 'dart_html_tag': '0.13.3', @@ -65,7 +65,7 @@ vars = { 'dart_matcher_tag': '0.12.1+4', 'dart_mime_tag': '0.9.6', 'dart_mockito_tag': 'a92db054fba18bc2d605be7670aee74b7cadc00a', - 'dart_mustache4dart_tag': 'v2.1.0', + 'dart_mustache4dart_tag': 'v2.1.1', 'dart_oauth2_tag': '1.1.0', 'dart_observatory_pub_packages_rev': 'd3a3aebefbd35aa30fe7bbc2889b772b398f7d7f', 'dart_package_config_tag': '1.0.3', diff --git a/runtime/dart_isolate.cc b/runtime/dart_isolate.cc index 63c0a5350a9..2c4a11c92c8 100644 --- a/runtime/dart_isolate.cc +++ b/runtime/dart_isolate.cc @@ -409,7 +409,10 @@ bool DartIsolate::MarkIsolateRunnable() { // There must be no current isolate to mark an isolate as being runnable. Dart_ExitIsolate(); - if (!Dart_IsolateMakeRunnable(isolate())) { + char* error = Dart_IsolateMakeRunnable(isolate()); + if (error) { + FXL_DLOG(ERROR) << error; + ::free(error); // Failed. Restore the isolate. Dart_EnterIsolate(isolate()); return false; diff --git a/runtime/dart_service_isolate.cc b/runtime/dart_service_isolate.cc index 54c0bf97225..3239e4f437e 100644 --- a/runtime/dart_service_isolate.cc +++ b/runtime/dart_service_isolate.cc @@ -137,11 +137,10 @@ bool DartServiceIsolate::Startup(std::string server_ip, // Make runnable. Dart_ExitScope(); Dart_ExitIsolate(); - bool retval = Dart_IsolateMakeRunnable(isolate); - if (!retval) { + *error = Dart_IsolateMakeRunnable(isolate); + if (*error) { Dart_EnterIsolate(isolate); Dart_ShutdownIsolate(); - *error = strdup("Invalid isolate state - Unable to make it runnable."); return false; } Dart_EnterIsolate(isolate); diff --git a/runtime/dart_vm.cc b/runtime/dart_vm.cc index fa827ef477f..15314d04b45 100644 --- a/runtime/dart_vm.cc +++ b/runtime/dart_vm.cc @@ -383,7 +383,11 @@ DartVM::DartVM(const Settings& settings, for (size_t i = 0; i < settings.dart_flags.size(); i++) args.push_back(settings.dart_flags[i].c_str()); - FXL_CHECK(Dart_SetVMFlags(args.size(), args.data())); + char* flags_error = Dart_SetVMFlags(args.size(), args.data()); + if (flags_error) { + FXL_LOG(FATAL) << "Error while setting Dart VM flags: " << flags_error; + ::free(flags_error); + } DartUI::InitForGlobal(); diff --git a/travis/licenses_golden/licenses_third_party b/travis/licenses_golden/licenses_third_party index f57f2fbce4f..f01e6787474 100644 --- a/travis/licenses_golden/licenses_third_party +++ b/travis/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: 759192b81fc370d3de4de0d021329916 +Signature: 0bb9afe000319cd63fc59230bab57873 UNUSED LICENSES: @@ -5663,7 +5663,6 @@ FILE: ../../../third_party/dart/runtime/bin/vmservice/server.dart FILE: ../../../third_party/dart/runtime/bin/vmservice/vmservice_io.dart FILE: ../../../third_party/dart/runtime/bin/vmservice_impl.cc FILE: ../../../third_party/dart/runtime/bin/vmservice_impl.h -FILE: ../../../third_party/dart/runtime/include/dart_mirrors_api.h FILE: ../../../third_party/dart/runtime/include/dart_native_api.h FILE: ../../../third_party/dart/runtime/lib/collection_patch.dart FILE: ../../../third_party/dart/runtime/lib/core_patch.dart @@ -5800,7 +5799,6 @@ FILE: ../../../third_party/dart/runtime/vm/isolate.cc FILE: ../../../third_party/dart/runtime/vm/isolate.h FILE: ../../../third_party/dart/runtime/vm/json_stream.cc FILE: ../../../third_party/dart/runtime/vm/json_stream.h -FILE: ../../../third_party/dart/runtime/vm/mirrors_api_impl.cc FILE: ../../../third_party/dart/runtime/vm/native_api_impl.cc FILE: ../../../third_party/dart/runtime/vm/native_symbol.h FILE: ../../../third_party/dart/runtime/vm/native_symbol_android.cc