diff --git a/DEPS b/DEPS index d69038e2bde..153a69ecbf1 100644 --- a/DEPS +++ b/DEPS @@ -26,8 +26,8 @@ vars = { # Note: When updating the Dart revision, ensure that all entries that are # dependencies of dart are also updated - 'dart_revision': '69fa11d912b5670079d02b0d76c1b5abcbe8a7a7', - 'dart_boringssl_gen_revision': '1a810313a0290e1caace9da73fa3ab89995ad2c7', + 'dart_revision': '42ec925a9e8be87e515f06440e01e11c832b8da7', + 'dart_boringssl_gen_revision': '753224969dbe43dad29343146529727b5066c0f3', 'dart_boringssl_revision': 'd519bf6be0b447fb80fbc539d4bff4479b5482a2', 'dart_observatory_packages_revision': '26aad88f1c1915d39bbcbff3cad589e2402fdcf1', 'dart_root_certificates_revision': 'a4c7c6f23a664a37bc1b6f15a819e3f2a292791a', @@ -57,7 +57,7 @@ deps = { Var('fuchsia_git') + '/ftl' + '@' + 'f1357b6eaa9a23cffec1645dfeba610b5f926b1d', 'src/lib/tonic': - Var('fuchsia_git') + '/tonic' + '@' + '837a249e73593bd22c4a071778192d1b4f1f931d', + Var('fuchsia_git') + '/tonic' + '@' + '82075233dc0cd23b1c8af5f694eb86dd9bd10f35', 'src/lib/zip': Var('fuchsia_git') + '/zip' + '@' + '92dc87ca645fe8e9f5151ef6dac86d8311a7222f', diff --git a/engine/src/flutter/fml/BUILD.gn b/engine/src/flutter/fml/BUILD.gn index 12a5f41a0f8..7e01dfb7a4e 100644 --- a/engine/src/flutter/fml/BUILD.gn +++ b/engine/src/flutter/fml/BUILD.gn @@ -26,7 +26,7 @@ source_set("fml") { ] deps = [ - "//dart/runtime:libdart", + "//dart/runtime:dart_api", "//lib/ftl", # These need to be in sync with the Fuchsia buildroot. @@ -111,6 +111,7 @@ executable("fml_unittests") { ] deps = [ + "//dart/runtime:libdart_jit", "//flutter/fml", "//flutter/testing", "//lib/ftl", diff --git a/engine/src/flutter/lib/io/BUILD.gn b/engine/src/flutter/lib/io/BUILD.gn index 602da2b08f9..ad48b9e147c 100644 --- a/engine/src/flutter/lib/io/BUILD.gn +++ b/engine/src/flutter/lib/io/BUILD.gn @@ -9,7 +9,7 @@ source_set("io") { ] deps = [ - "//dart/runtime:libdart", + "//dart/runtime:dart_api", "//dart/runtime/bin:embedded_dart_io", "//lib/ftl", "//lib/tonic/converter", diff --git a/engine/src/flutter/runtime/BUILD.gn b/engine/src/flutter/runtime/BUILD.gn index 952ed30e1b4..a152aaa2042 100644 --- a/engine/src/flutter/runtime/BUILD.gn +++ b/engine/src/flutter/runtime/BUILD.gn @@ -75,7 +75,7 @@ source_set("runtime") { deps = [ ":embedded_resources_cc", - "//dart/runtime:libdart", + "//dart/runtime:dart_api", "//dart/runtime/bin:embedded_dart_io", "//flutter/assets", "//flutter/common", diff --git a/engine/src/flutter/shell/common/BUILD.gn b/engine/src/flutter/shell/common/BUILD.gn index 5ef78a52651..1c8ae49627e 100644 --- a/engine/src/flutter/shell/common/BUILD.gn +++ b/engine/src/flutter/shell/common/BUILD.gn @@ -101,7 +101,7 @@ source_set("common") { deps = [ ":generate_embedder_diagnostic_server_resources_cc", - "//dart/runtime:libdart", + "//dart/runtime:dart_api", "//dart/runtime/vm:libdart_platform", "//flutter/assets", "//flutter/common", diff --git a/engine/src/flutter/shell/platform/android/BUILD.gn b/engine/src/flutter/shell/platform/android/BUILD.gn index ece9b15c6b4..36ee6a16234 100644 --- a/engine/src/flutter/shell/platform/android/BUILD.gn +++ b/engine/src/flutter/shell/platform/android/BUILD.gn @@ -2,6 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//flutter/common/config.gni") import("//flutter/shell/config.gni") import("//build/config/android/config.gni") import("//build/config/android/rules.gni") @@ -34,7 +35,6 @@ shared_library("flutter_shell_native") { ] deps = [ - "//dart/runtime:libdart", "//flutter/common", "//flutter/flow", "//flutter/fml", @@ -45,6 +45,11 @@ shared_library("flutter_shell_native") { "//lib/ftl", "//third_party/skia", ] + if (flutter_runtime_mode == "debug") { + deps += [ "//dart/runtime:libdart_jit" ] + } else { + deps += [ "//dart/runtime:libdart_precompiled_runtime" ] + } defines = [] diff --git a/engine/src/flutter/shell/platform/darwin/BUILD.gn b/engine/src/flutter/shell/platform/darwin/BUILD.gn index 374d9bb3ab8..0055ace6928 100644 --- a/engine/src/flutter/shell/platform/darwin/BUILD.gn +++ b/engine/src/flutter/shell/platform/darwin/BUILD.gn @@ -35,7 +35,6 @@ source_set("flutter_channels") { set_sources_assignment_filter(sources_assignment_filter) deps = [ - "//dart/runtime:libdart", "//flutter/common", "//flutter/flow", "//flutter/fml", @@ -61,6 +60,7 @@ executable("flutter_channels_unittests") { deps = [ ":flutter_channels", + "//dart/runtime:libdart_jit", "//flutter/testing", ] } diff --git a/engine/src/flutter/shell/platform/darwin/common/BUILD.gn b/engine/src/flutter/shell/platform/darwin/common/BUILD.gn index 1a2dafbfc26..12f80f5157e 100644 --- a/engine/src/flutter/shell/platform/darwin/common/BUILD.gn +++ b/engine/src/flutter/shell/platform/darwin/common/BUILD.gn @@ -17,7 +17,7 @@ source_set("common") { set_sources_assignment_filter(sources_assignment_filter) deps = [ - "//dart/runtime:libdart", + "//dart/runtime:dart_api", "//flutter/common", "//flutter/flow", "//flutter/fml", diff --git a/engine/src/flutter/shell/platform/darwin/desktop/BUILD.gn b/engine/src/flutter/shell/platform/darwin/desktop/BUILD.gn index 0bab5c1adc1..2ffd2edc223 100644 --- a/engine/src/flutter/shell/platform/darwin/desktop/BUILD.gn +++ b/engine/src/flutter/shell/platform/darwin/desktop/BUILD.gn @@ -24,6 +24,7 @@ source_set("mac_desktop_platform") { ] deps = [ + "//dart/runtime:libdart_jit", "//flutter/common", "//flutter/fml", "//flutter/shell/common", diff --git a/engine/src/flutter/shell/platform/darwin/ios/BUILD.gn b/engine/src/flutter/shell/platform/darwin/ios/BUILD.gn index 200da7c8275..c80eae17376 100644 --- a/engine/src/flutter/shell/platform/darwin/ios/BUILD.gn +++ b/engine/src/flutter/shell/platform/darwin/ios/BUILD.gn @@ -4,6 +4,7 @@ assert(is_ios) +import("//flutter/common/config.gni") import("//build/config/ios/rules.gni") import("//build/config/ios/ios_sdk.gni") @@ -63,7 +64,6 @@ shared_library("flutter_framework_dylib") { ] deps = [ - "//dart/runtime:libdart", "//flutter/flow", "//flutter/fml", "//flutter/glue", @@ -76,6 +76,11 @@ shared_library("flutter_framework_dylib") { "//lib/ftl", "//third_party/skia", ] + if (flutter_runtime_mode == "debug") { + deps += [ "//dart/runtime:libdart_jit" ] + } else { + deps += [ "//dart/runtime:libdart_precompiled_runtime" ] + } defines = [ "FLUTTER_FRAMEWORK" ] diff --git a/engine/src/flutter/shell/platform/linux/BUILD.gn b/engine/src/flutter/shell/platform/linux/BUILD.gn index 4d819c9dccd..8546619847b 100644 --- a/engine/src/flutter/shell/platform/linux/BUILD.gn +++ b/engine/src/flutter/shell/platform/linux/BUILD.gn @@ -10,6 +10,7 @@ executable("linux") { ] deps = [ + "//dart/runtime:libdart_jit", "//dart/runtime/bin:embedded_dart_io", "//flutter/common", "//flutter/fml", diff --git a/engine/src/flutter/synchronization/BUILD.gn b/engine/src/flutter/synchronization/BUILD.gn index 387cd3447f6..69d74167596 100644 --- a/engine/src/flutter/synchronization/BUILD.gn +++ b/engine/src/flutter/synchronization/BUILD.gn @@ -27,5 +27,6 @@ executable("synchronization_unittests") { deps = [ ":synchronization", "//flutter/testing", + "//dart/runtime:libdart_jit", ] } diff --git a/engine/src/flutter/tools/gn b/engine/src/flutter/tools/gn index a9178439e6c..a5b72281e49 100755 --- a/engine/src/flutter/tools/gn +++ b/engine/src/flutter/tools/gn @@ -108,7 +108,8 @@ def to_gn_args(args): # snapshotting and linking costs of the precompiler during development. # We can still use the JIT on the simulator though. use_dbc = args.target_os == 'ios' and not args.simulator and args.runtime_mode == 'debug' - gn_args['dart_experimental_interpreter'] = use_dbc + if use_dbc: + gn_args['dart_target_arch'] = 'dbc' gn_args['flutter_runtime_mode'] = args.runtime_mode