Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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',
Expand Down
6 changes: 3 additions & 3 deletions ci/licenses_golden/licenses_third_party
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 6d1a89f1dbe2d429129075b165bee8ec
Signature: 1a325f5834d49b7daa016a4f2b01be3d

UNUSED LICENSES:

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/io/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]

Expand Down
9 changes: 4 additions & 5 deletions lib/io/dart_io.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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
2 changes: 1 addition & 1 deletion lib/ui/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/dart_runtime_hooks.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion runtime/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion runtime/dart_vm.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion shell/platform/embedder/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion shell/testing/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]
Expand Down
2 changes: 1 addition & 1 deletion shell/testing/tester_main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down