From b4e28e2b482fe4e24ef10307770bbba8cd573644 Mon Sep 17 00:00:00 2001 From: Ben Konyi Date: Fri, 28 Sep 2018 16:35:59 -0700 Subject: [PATCH] Dart SDK roll for 2018-09-28 --- DEPS | 4 ++-- ci/licenses_golden/licenses_third_party | 6 +++--- lib/io/BUILD.gn | 2 +- lib/io/dart_io.cc | 9 ++++----- lib/ui/BUILD.gn | 2 +- lib/ui/dart_runtime_hooks.cc | 2 +- runtime/BUILD.gn | 2 +- runtime/dart_vm.cc | 2 +- shell/platform/embedder/BUILD.gn | 2 +- shell/testing/BUILD.gn | 2 +- shell/testing/tester_main.cc | 2 +- 11 files changed, 17 insertions(+), 18 deletions(-) diff --git a/DEPS b/DEPS index 9fcee1e925f24..cfc2b03065c3b 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/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index 4c6b525f85252..d19a9cf160cda 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: 6d1a89f1dbe2d429129075b165bee8ec +Signature: 1a325f5834d49b7daa016a4f2b01be3d UNUSED LICENSES: @@ -5663,10 +5663,10 @@ ORIGIN: ../../../third_party/dart/runtime/bin/vmservice/loader.dart + ../../../t TYPE: LicenseType.bsd FILE: ../../../third_party/dart/runtime/bin/address_sanitizer.cc FILE: ../../../third_party/dart/runtime/bin/builtin_common.cc -FILE: ../../../third_party/dart/runtime/bin/embedded_dart_io.cc -FILE: ../../../third_party/dart/runtime/bin/embedded_dart_io.h +FILE: ../../../third_party/dart/runtime/bin/dart_io_api_impl.cc FILE: ../../../third_party/dart/runtime/bin/observatory_assets_empty.cc FILE: ../../../third_party/dart/runtime/bin/vmservice/loader.dart +FILE: ../../../third_party/dart/runtime/include/bin/dart_io_api.h FILE: ../../../third_party/dart/runtime/lib/async_patch.dart FILE: ../../../third_party/dart/runtime/lib/compact_hash.dart FILE: ../../../third_party/dart/runtime/lib/developer.cc diff --git a/lib/io/BUILD.gn b/lib/io/BUILD.gn index ad58d8f0cdcba..5db1cf3563421 100644 --- a/lib/io/BUILD.gn +++ b/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/lib/io/dart_io.cc b/lib/io/dart_io.cc index 272ea58de9f4d..6dbf65eb7bf2b 100644 --- a/lib/io/dart_io.cc +++ b/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/lib/ui/BUILD.gn b/lib/ui/BUILD.gn index 8ee92a71dcfca..cfb8461b19615 100644 --- a/lib/ui/BUILD.gn +++ b/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/lib/ui/dart_runtime_hooks.cc b/lib/ui/dart_runtime_hooks.cc index 4b8cd18ef4321..7f1cd0c0ecf56 100644 --- a/lib/ui/dart_runtime_hooks.cc +++ b/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/runtime/BUILD.gn b/runtime/BUILD.gn index 164a92e686241..b5ff2efea43e8 100644 --- a/runtime/BUILD.gn +++ b/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/runtime/dart_vm.cc b/runtime/dart_vm.cc index 29fd74159213b..e9300654af610 100644 --- a/runtime/dart_vm.cc +++ b/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/shell/platform/embedder/BUILD.gn b/shell/platform/embedder/BUILD.gn index fcd2dc5a2aed4..40426bdb9cabb 100644 --- a/shell/platform/embedder/BUILD.gn +++ b/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/shell/testing/BUILD.gn b/shell/testing/BUILD.gn index 0519d414a2532..cc3d835c42e04 100644 --- a/shell/testing/BUILD.gn +++ b/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/shell/testing/tester_main.cc b/shell/testing/tester_main.cc index 83b4e1939eb0f..207e35301ff5d 100644 --- a/shell/testing/tester_main.cc +++ b/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