diff --git a/DEPS b/DEPS index 640df86161..016ba6485d 100644 --- a/DEPS +++ b/DEPS @@ -30,7 +30,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': '15258fd7a76cbf49a1b3eb86d8695602e792abb5', + 'dart_revision': '734beef0624a9b246e892c95ca0c301c5d318331', 'dart_args_tag': '0.13.7', 'dart_async_tag': 'daf66909019d2aaec1721fc39d94ea648a9fdc1d', diff --git a/engine/src/flutter/lib/snapshot/BUILD.gn b/engine/src/flutter/lib/snapshot/BUILD.gn index 9d97333c3c..10f225190e 100644 --- a/engine/src/flutter/lib/snapshot/BUILD.gn +++ b/engine/src/flutter/lib/snapshot/BUILD.gn @@ -4,7 +4,18 @@ import("//flutter/lib/ui/dart_ui.gni") -import("//dart/runtime/vm/gypi_contents.gni") +import("//dart/runtime/bin/io_sources.gni") +import("//dart/runtime/lib/async_sources.gni") +import("//dart/runtime/lib/collection_sources.gni") +import("//dart/runtime/lib/convert_sources.gni") +import("//dart/runtime/lib/core_sources.gni") +import("//dart/runtime/lib/developer_sources.gni") +import("//dart/runtime/lib/internal_sources.gni") +import("//dart/runtime/lib/isolate_sources.gni") +import("//dart/runtime/lib/math_sources.gni") +import("//dart/runtime/lib/mirrors_sources.gni") +import("//dart/runtime/lib/typed_data_sources.gni") + import("//dart/utils/generate_patch_sdk.gni") if (is_fuchsia) { @@ -321,57 +332,57 @@ generate_vm_patched_sdk("flutter_patched_sdk") { libraries = [ [ "async", - processed_gypis.async_runtime_sources, + async_runtime_sources, "//dart/runtime/lib", ], [ "collection", - processed_gypis.collection_runtime_sources, + collection_runtime_sources, "//dart/runtime/lib", ], [ "convert", - processed_gypis.convert_runtime_sources, + convert_runtime_sources, "//dart/runtime/lib", ], [ "core", - processed_gypis.core_runtime_sources, + core_runtime_sources, "//dart/runtime/lib", ], [ "developer", - processed_gypis.developer_runtime_sources, + developer_runtime_sources, "//dart/runtime/lib", ], [ "internal", - processed_gypis.internal_runtime_sources, + internal_runtime_sources, "//dart/runtime/lib", ], [ "io", - processed_gypis.bin_io_sources, + io_runtime_sources, "//dart/runtime/bin", ], [ "isolate", - processed_gypis.isolate_runtime_sources, + isolate_runtime_sources, "//dart/runtime/lib", ], [ "math", - processed_gypis.math_runtime_sources, + math_runtime_sources, "//dart/runtime/lib", ], [ "mirrors", - processed_gypis.mirrors_runtime_sources, + mirrors_runtime_sources, "//dart/runtime/lib", ], [ "typed_data", - processed_gypis.typed_data_runtime_sources, + typed_data_runtime_sources, "//dart/runtime/lib", ], ] diff --git a/engine/src/flutter/runtime/BUILD.gn b/engine/src/flutter/runtime/BUILD.gn index c7895bf406..5738c5ae03 100644 --- a/engine/src/flutter/runtime/BUILD.gn +++ b/engine/src/flutter/runtime/BUILD.gn @@ -2,15 +2,9 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//dart/runtime/bin/vmservice/vmservice_sources.gni") import("//flutter/common/config.gni") -vmservice_sources_gypi = - exec_script( - "//build/gypi_to_gn.py", - [ rebase_path("//dart/runtime/bin/vmservice/vmservice_sources.gypi") ], - "scope", - [ rebase_path("//dart/runtime/bin/vmservice/vmservice_sources.gypi") ]) - action("gen_embedded_resources_cc") { script = "//dart/runtime/tools/create_resources.py" output_file = "$target_gen_dir/embedded_resources.cc" @@ -18,7 +12,7 @@ action("gen_embedded_resources_cc") { output_file, ] - inputs = rebase_path(vmservice_sources_gypi.sources, + inputs = rebase_path(vmservice_sources, "", "//dart/runtime/bin/vmservice") diff --git a/engine/src/flutter/shell/common/BUILD.gn b/engine/src/flutter/shell/common/BUILD.gn index 1c8ae49627..55e8d31c68 100644 --- a/engine/src/flutter/shell/common/BUILD.gn +++ b/engine/src/flutter/shell/common/BUILD.gn @@ -102,7 +102,7 @@ source_set("common") { deps = [ ":generate_embedder_diagnostic_server_resources_cc", "//dart/runtime:dart_api", - "//dart/runtime/vm:libdart_platform", + "//dart/runtime/platform:libdart_platform", "//flutter/assets", "//flutter/common", "//flutter/flow", diff --git a/engine/src/flutter/sky/packages/sky_engine/BUILD.gn b/engine/src/flutter/sky/packages/sky_engine/BUILD.gn index c74532371d..1d7f545aee 100644 --- a/engine/src/flutter/sky/packages/sky_engine/BUILD.gn +++ b/engine/src/flutter/sky/packages/sky_engine/BUILD.gn @@ -2,7 +2,17 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//dart/sdk/lib/rules.gni") +import("//dart/sdk/lib/async/async_sources.gni") +import("//dart/sdk/lib/collection/collection_sources.gni") +import("//dart/sdk/lib/convert/convert_sources.gni") +import("//dart/sdk/lib/core/core_sources.gni") +import("//dart/sdk/lib/developer/developer_sources.gni") +import("//dart/sdk/lib/internal/internal_sources.gni") +import("//dart/sdk/lib/io/io_sources.gni") +import("//dart/sdk/lib/isolate/isolate_sources.gni") +import("//dart/sdk/lib/math/math_sources.gni") +import("//dart/sdk/lib/typed_data/typed_data_sources.gni") + import("//flutter/build/dart/rules.gni") import("//flutter/lib/ui/dart_ui.gni") import("//flutter/sky/engine/core/core.gni") @@ -19,54 +29,69 @@ if (!is_fuchsia) { } } -dart_sdk_lib_copy("async") { - sdk_lib_name = "async" - destination = "$root_gen_dir/dart-pkg/sky_engine/lib" + +dart_sdk_lib_path = rebase_path("//dart/sdk/lib") + +copy("async") { + lib_path = rebase_path("async", "", dart_sdk_lib_path) + sources = rebase_path(async_sdk_sources, "", lib_path) + outputs = [ + "$root_gen_dir/dart-pkg/sky_engine/lib/async/{{source_file_part}}" + ] } -dart_sdk_lib_copy("collection") { - sdk_lib_name = "collection" - destination = "$root_gen_dir/dart-pkg/sky_engine/lib" +copy("collection") { + lib_path = rebase_path("collection", "", dart_sdk_lib_path) + sources = rebase_path(collection_sdk_sources, "", lib_path) + outputs = [ "$root_gen_dir/dart-pkg/sky_engine/lib/collection/{{source_file_part}}" ] } -dart_sdk_lib_copy("convert") { - sdk_lib_name = "convert" - destination = "$root_gen_dir/dart-pkg/sky_engine/lib" +copy("convert") { + lib_path = rebase_path("convert", "", dart_sdk_lib_path) + sources = rebase_path(convert_sdk_sources, "", lib_path) + outputs = [ "$root_gen_dir/dart-pkg/sky_engine/lib/convert/{{source_file_part}}" ] } -dart_sdk_lib_copy("core") { - sdk_lib_name = "core" - destination = "$root_gen_dir/dart-pkg/sky_engine/lib" +copy("core") { + lib_path = rebase_path("core", "", dart_sdk_lib_path) + sources = rebase_path(core_sdk_sources, "", lib_path) + outputs = [ "$root_gen_dir/dart-pkg/sky_engine/lib/core/{{source_file_part}}" ] } -dart_sdk_lib_copy("developer") { - sdk_lib_name = "developer" - destination = "$root_gen_dir/dart-pkg/sky_engine/lib" +copy("developer") { + lib_path = rebase_path("developer", "", dart_sdk_lib_path) + sources = rebase_path(developer_sdk_sources, "", lib_path) + outputs = [ "$root_gen_dir/dart-pkg/sky_engine/lib/developer/{{source_file_part}}" ] } -dart_sdk_lib_copy("internal") { - sdk_lib_name = "internal" - destination = "$root_gen_dir/dart-pkg/sky_engine/lib" +copy("internal") { + lib_path = rebase_path("internal", "", dart_sdk_lib_path) + sources = rebase_path(internal_sdk_sources, "", lib_path) + outputs = [ "$root_gen_dir/dart-pkg/sky_engine/lib/internal/{{source_file_part}}" ] } -dart_sdk_lib_copy("io") { - sdk_lib_name = "io" - destination = "$root_gen_dir/dart-pkg/sky_engine/lib" +copy("io") { + lib_path = rebase_path("io", "", dart_sdk_lib_path) + sources = rebase_path(io_sdk_sources, "", lib_path) + outputs = [ "$root_gen_dir/dart-pkg/sky_engine/lib/io/{{source_file_part}}" ] } -dart_sdk_lib_copy("isolate") { - sdk_lib_name = "isolate" - destination = "$root_gen_dir/dart-pkg/sky_engine/lib" +copy("isolate") { + lib_path = rebase_path("isolate", "", dart_sdk_lib_path) + sources = rebase_path(isolate_sdk_sources, "", lib_path) + outputs = [ "$root_gen_dir/dart-pkg/sky_engine/lib/isolate/{{source_file_part}}" ] } -dart_sdk_lib_copy("math") { - sdk_lib_name = "math" - destination = "$root_gen_dir/dart-pkg/sky_engine/lib" +copy("math") { + lib_path = rebase_path("math", "", dart_sdk_lib_path) + sources = rebase_path(math_sdk_sources, "", lib_path) + outputs = [ "$root_gen_dir/dart-pkg/sky_engine/lib/math/{{source_file_part}}" ] } -dart_sdk_lib_copy("typed_data") { - sdk_lib_name = "typed_data" - destination = "$root_gen_dir/dart-pkg/sky_engine/lib" +copy("typed_data") { + lib_path = rebase_path("typed_data", "", dart_sdk_lib_path) + sources = rebase_path(typed_data_sdk_sources, "", lib_path) + outputs = [ "$root_gen_dir/dart-pkg/sky_engine/lib/typed_data/{{source_file_part}}" ] } copy("copy_dart_ui") {