diff --git a/DEPS b/DEPS index 9fcee1e925..cfc2b03065 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': '2aac05fe104940cec9806896cdbe3ad2ad9254e1', + 'dart_revision': '8a919426f0e8665a0e6b01c2fcf3113587f8b040', # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py @@ -60,7 +60,7 @@ vars = { 'dart_http_throttle_tag': '1.0.2', 'dart_intl_tag': '0.15.6', 'dart_json_rpc_2_tag': '2.0.9', - 'dart_linter_tag': '0.1.64', + 'dart_linter_tag': '0.1.65', 'dart_logging_tag': '0.11.3+2', 'dart_markdown_tag': '2.0.2', 'dart_matcher_tag': '0.12.3', diff --git a/engine/src/flutter/lib/io/BUILD.gn b/engine/src/flutter/lib/io/BUILD.gn index ad58d8f0cd..5db1cf3563 100644 --- a/engine/src/flutter/lib/io/BUILD.gn +++ b/engine/src/flutter/lib/io/BUILD.gn @@ -10,7 +10,7 @@ source_set("io") { deps = [ "//third_party/dart/runtime:dart_api", - "//third_party/dart/runtime/bin:embedded_dart_io", + "//third_party/dart/runtime/bin:dart_io_api", "//third_party/tonic", ] diff --git a/engine/src/flutter/lib/io/dart_io.cc b/engine/src/flutter/lib/io/dart_io.cc index 272ea58de9..6dbf65eb7b 100644 --- a/engine/src/flutter/lib/io/dart_io.cc +++ b/engine/src/flutter/lib/io/dart_io.cc @@ -4,8 +4,7 @@ #include "flutter/lib/io/dart_io.h" -#include "third_party/dart/runtime/bin/crypto.h" -#include "third_party/dart/runtime/bin/io_natives.h" +#include "third_party/dart/runtime/include/bin/dart_io_api.h" #include "third_party/dart/runtime/include/dart_api.h" #include "third_party/tonic/converter/dart_converter.h" @@ -15,12 +14,12 @@ namespace blink { void DartIO::InitForIsolate() { DART_CHECK_VALID(Dart_SetNativeResolver(Dart_LookupLibrary(ToDart("dart:io")), - dart::bin::IONativeLookup, - dart::bin::IONativeSymbol)); + dart::bin::LookupIONative, + dart::bin::LookupIONativeSymbol)); } bool DartIO::EntropySource(uint8_t* buffer, intptr_t length) { - return dart::bin::Crypto::GetRandomBytes(length, buffer); + return dart::bin::GetEntropy(buffer, length); } } // namespace blink diff --git a/engine/src/flutter/lib/ui/BUILD.gn b/engine/src/flutter/lib/ui/BUILD.gn index 8ee92a71dc..cfb8461b19 100644 --- a/engine/src/flutter/lib/ui/BUILD.gn +++ b/engine/src/flutter/lib/ui/BUILD.gn @@ -102,7 +102,7 @@ source_set("ui") { "$flutter_root/flow", "$flutter_root/fml", "$flutter_root/runtime:test_font", - "//third_party/dart/runtime/bin:embedded_dart_io", + "//third_party/dart/runtime/bin:dart_io_api", "//third_party/rapidjson", "//third_party/skia", "//third_party/skia:effects", diff --git a/engine/src/flutter/lib/ui/dart_runtime_hooks.cc b/engine/src/flutter/lib/ui/dart_runtime_hooks.cc index 4b8cd18ef4..7f1cd0c0ec 100644 --- a/engine/src/flutter/lib/ui/dart_runtime_hooks.cc +++ b/engine/src/flutter/lib/ui/dart_runtime_hooks.cc @@ -16,7 +16,7 @@ #include "flutter/fml/logging.h" #include "flutter/lib/ui/plugins/callback_cache.h" #include "flutter/lib/ui/ui_dart_state.h" -#include "third_party/dart/runtime/bin/embedded_dart_io.h" +#include "third_party/dart/runtime/include/bin/dart_io_api.h" #include "third_party/dart/runtime/include/dart_api.h" #include "third_party/dart/runtime/include/dart_tools_api.h" #include "third_party/tonic/converter/dart_converter.h" diff --git a/engine/src/flutter/runtime/BUILD.gn b/engine/src/flutter/runtime/BUILD.gn index 164a92e686..b5ff2efea4 100644 --- a/engine/src/flutter/runtime/BUILD.gn +++ b/engine/src/flutter/runtime/BUILD.gn @@ -94,7 +94,7 @@ source_set("runtime") { "$flutter_root/lib/ui", "$flutter_root/third_party/txt", "//third_party/dart/runtime:dart_api", - "//third_party/dart/runtime/bin:embedded_dart_io", + "//third_party/dart/runtime/bin:dart_io_api", "//third_party/rapidjson", "//third_party/skia", "//third_party/tonic", diff --git a/engine/src/flutter/runtime/dart_vm.cc b/engine/src/flutter/runtime/dart_vm.cc index 29fd741592..e9300654af 100644 --- a/engine/src/flutter/runtime/dart_vm.cc +++ b/engine/src/flutter/runtime/dart_vm.cc @@ -23,7 +23,7 @@ #include "flutter/runtime/dart_isolate.h" #include "flutter/runtime/dart_service_isolate.h" #include "flutter/runtime/start_up.h" -#include "third_party/dart/runtime/bin/embedded_dart_io.h" +#include "third_party/dart/runtime/include/bin/dart_io_api.h" #include "third_party/tonic/converter/dart_converter.h" #include "third_party/tonic/dart_class_library.h" #include "third_party/tonic/dart_class_provider.h" diff --git a/engine/src/flutter/shell/platform/embedder/BUILD.gn b/engine/src/flutter/shell/platform/embedder/BUILD.gn index fcd2dc5a2a..40426bdb9c 100644 --- a/engine/src/flutter/shell/platform/embedder/BUILD.gn +++ b/engine/src/flutter/shell/platform/embedder/BUILD.gn @@ -37,7 +37,7 @@ source_set("embedder") { "$flutter_root/lib/snapshot", "$flutter_root/shell/common", "//third_party/dart/runtime:libdart_jit", - "//third_party/dart/runtime/bin:embedded_dart_io", + "//third_party/dart/runtime/bin:dart_io_api", "//third_party/skia", "//third_party/skia:gpu", "//third_party/tonic", diff --git a/engine/src/flutter/shell/testing/BUILD.gn b/engine/src/flutter/shell/testing/BUILD.gn index 0519d414a2..cc3d835c42 100644 --- a/engine/src/flutter/shell/testing/BUILD.gn +++ b/engine/src/flutter/shell/testing/BUILD.gn @@ -20,7 +20,7 @@ executable("testing") { "$flutter_root/lib/snapshot", "$flutter_root/shell/common", "//third_party/dart/runtime:libdart_jit", - "//third_party/dart/runtime/bin:embedded_dart_io", + "//third_party/dart/runtime/bin:dart_io_api", "//third_party/skia", "//third_party/tonic", ] diff --git a/engine/src/flutter/shell/testing/tester_main.cc b/engine/src/flutter/shell/testing/tester_main.cc index 83b4e1939e..207e35301f 100644 --- a/engine/src/flutter/shell/testing/tester_main.cc +++ b/engine/src/flutter/shell/testing/tester_main.cc @@ -19,7 +19,7 @@ #include "flutter/shell/common/shell.h" #include "flutter/shell/common/switches.h" #include "flutter/shell/common/thread_host.h" -#include "third_party/dart/runtime/bin/embedded_dart_io.h" +#include "third_party/dart/runtime/include/bin/dart_io_api.h" #ifdef ERROR #undef ERROR