diff --git a/DEPS b/DEPS index e04539d1a6a32..c59b7eed8f73e 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': 'b99bcfd3099f0d32e39287160a9539e878cb0b68', + 'dart_revision': '45f9462398ae7d2e80acd79d3f9c32c7ca6f6f97', # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py @@ -47,9 +47,9 @@ vars = { 'dart_convert_tag': '2.0.2', 'dart_crypto_tag': '2.0.6', 'dart_csslib_tag': '0.14.4+1', - 'dart_dart2js_info_tag': '0.5.6+4', + 'dart_dart2js_info_tag': '0.5.13', 'dart_dart_style_tag': '1.2.0', - 'dart_dartdoc_tag': 'v0.23.1', + 'dart_dartdoc_tag': 'v0.24.1', 'dart_fixnum_tag': '0.10.8', 'dart_glob_tag': '1.1.7', 'dart_html_tag': '0.13.3+2', @@ -60,7 +60,7 @@ vars = { 'dart_http_throttle_tag': '1.0.2', 'dart_intl_tag': '0.15.7', 'dart_json_rpc_2_tag': '2.0.9', - 'dart_linter_tag': '0.1.68', + 'dart_linter_tag': '0.1.70', 'dart_logging_tag': '0.11.3+2', 'dart_markdown_tag': '2.0.2', 'dart_matcher_tag': '0.12.3', @@ -92,7 +92,7 @@ vars = { 'dart_string_scanner_tag': '1.0.3', 'dart_term_glyph_tag': '1.0.1', 'dart_test_reflective_loader_tag': '0.1.8', - 'dart_test_tag': '1.0.0', + 'dart_test_tag': '1.3.4', 'dart_tuple_tag': 'v1.0.1', 'dart_typed_data_tag': '1.1.6', 'dart_usage_tag': '3.4.0', diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index 8854f4642f33d..c5c6fc633659f 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: 288479a70ccd3cb5cff17176ada4dfa1 +Signature: d91d49f0e8c58eb2fe7be4d8b2ed65eb UNUSED LICENSES: @@ -4432,6 +4432,7 @@ ORIGIN: ../../../third_party/dart/LICENSE TYPE: LicenseType.bsd FILE: ../../../third_party/dart/.gitconfig FILE: ../../../third_party/dart/.mailmap +FILE: ../../../third_party/dart/.vpython FILE: ../../../third_party/dart/client/idea/.idea/.name FILE: ../../../third_party/dart/client/idea/.idea/inspectionProfiles/Project_Default.xml FILE: ../../../third_party/dart/client/idea/.idea/vcs.xml @@ -5271,7 +5272,6 @@ FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/sourc FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/target.dart FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/thread.dart FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/timeline_event.dart -FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/token_stream.dart FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/type_arguments.dart FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/unknown.dart FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/vm.dart @@ -5458,6 +5458,8 @@ FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/disassembler_kbc.c FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/disassembler_kbc.h FILE: ../../../third_party/dart/runtime/vm/compiler/backend/code_statistics.cc FILE: ../../../third_party/dart/runtime/vm/compiler/backend/code_statistics.h +FILE: ../../../third_party/dart/runtime/vm/compiler/backend/loops.cc +FILE: ../../../third_party/dart/runtime/vm/compiler/backend/loops.h FILE: ../../../third_party/dart/runtime/vm/compiler/compiler_pass.cc FILE: ../../../third_party/dart/runtime/vm/compiler/compiler_pass.h FILE: ../../../third_party/dart/runtime/vm/compiler/compiler_state.h @@ -5542,8 +5544,6 @@ FILE: ../../../third_party/dart/runtime/vm/code_patcher_x64_test.cc FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/disassembler.cc FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/disassembler.h FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/disassembler_test.cc -FILE: ../../../third_party/dart/runtime/vm/compiler_stats.cc -FILE: ../../../third_party/dart/runtime/vm/compiler_stats.h FILE: ../../../third_party/dart/runtime/vm/cpu_ia32.cc FILE: ../../../third_party/dart/runtime/vm/custom_isolate_test.cc FILE: ../../../third_party/dart/runtime/vm/dart.h @@ -5879,7 +5879,6 @@ FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/sentinel_va FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/sentinel_view.dart FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/source_inset.dart FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/stack_trace_tree_config.dart -FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/token_stream_ref.dart FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/type_arguments_ref.dart FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/unknown_ref.dart FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/vm_view.dart diff --git a/runtime/BUILD.gn b/runtime/BUILD.gn index bf4b8e6fb8316..1fa0d73af64e2 100644 --- a/runtime/BUILD.gn +++ b/runtime/BUILD.gn @@ -6,41 +6,6 @@ import("//third_party/dart/runtime/bin/vmservice/vmservice_sources.gni") import("$flutter_root/common/config.gni") import("$flutter_root/testing/testing.gni") -action("gen_embedded_resources_cc") { - script = "//third_party/dart/runtime/tools/create_resources.py" - output_file = "$target_gen_dir/embedded_resources.cc" - outputs = [ - output_file, - ] - - inputs = rebase_path(vmservice_sources, - "", - "//third_party/dart/runtime/bin/vmservice") - - args = [ - "--output", - rebase_path(output_file), - "--outer_namespace", - "flutter", - "--inner_namespace", - "runtime", - "--table_name", - "flutter_embedded_service_isolate", - "--root_prefix", - rebase_path("//third_party/dart/runtime/bin/"), - ] + rebase_path(inputs) -} - -source_set("embedded_resources_cc") { - sources = [ - "$target_gen_dir/embedded_resources.cc", - ] - deps = [ - ":gen_embedded_resources_cc", - ] - public_configs = [ "$flutter_root:config" ] -} - source_set("test_font") { sources = [ "test_font_data.cc", @@ -84,7 +49,6 @@ source_set("runtime") { ] deps = [ - ":embedded_resources_cc", ":test_font", "$flutter_root/assets", "$flutter_root/common",