diff --git a/engine/src/flutter/lib/snapshot/libraries.yaml b/engine/src/flutter/lib/snapshot/libraries.yaml index 57121cb7893..c4244eaff87 100644 --- a/engine/src/flutter/lib/snapshot/libraries.yaml +++ b/engine/src/flutter/lib/snapshot/libraries.yaml @@ -5,7 +5,7 @@ # Note: if you edit this file, you must also edit libraries.json in this # directory: # -# python third_party/dart/tools/yaml2json.py flutter/lib/snapshot/libraries.yaml flutter/lib/snapshot/libraries.json +#. python third_party/dart/tools/yaml2json.py flutter/lib/snapshot/libraries.yaml flutter/lib/snapshot/libraries.json # # We currently have several different files that needs to be updated when # changing libraries, sources, and patch files. See diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/BUILD.gn b/engine/src/flutter/shell/platform/fuchsia/flutter/BUILD.gn index 671a7e47ccb..92e4c9c0d3e 100644 --- a/engine/src/flutter/shell/platform/fuchsia/flutter/BUILD.gn +++ b/engine/src/flutter/shell/platform/fuchsia/flutter/BUILD.gn @@ -155,12 +155,11 @@ template("jit_runner") { } package_dir(target_name) { - snapshot_gen_dir = - "$root_build_dir/gen/flutter/shell/platform/fuchsia/flutter/kernel" + snapshot_gen_dir = "$root_build_dir/gen/flutter/lib/snapshot" deps = [ ":jit${product_suffix}", - "kernel:kernel_core_snapshot", + "$flutter_root/lib/snapshot:generate_snapshot_bin", ] binary = "flutter_jit${product_suffix}_runner" diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/kernel/BUILD.gn b/engine/src/flutter/shell/platform/fuchsia/flutter/kernel/BUILD.gn index c634d1efac2..975381d7af5 100644 --- a/engine/src/flutter/shell/platform/fuchsia/flutter/kernel/BUILD.gn +++ b/engine/src/flutter/shell/platform/fuchsia/flutter/kernel/BUILD.gn @@ -2,15 +2,19 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/compiled_action.gni") -import("//build/fuchsia/sdk.gni") +import("//build/dart/dart_tool.gni") +import("//build/host.gni") import("//third_party/dart/utils/compile_platform.gni") +import("//topaz/runtime/dart/dart_component.gni") +import("//topaz/runtime/dart/dart_kernel.gni") +import("//topaz/runtime/flutter_runner/prebuilt_framework.gni") compile_platform("kernel_platform_files") { single_root_scheme = "org-dartlang-sdk" - single_root_base = rebase_path("../../../../../../") + single_root_base = rebase_path("../../../../") - libraries_specification_uri = "org-dartlang-sdk:///flutter/shell/platform/fuchsia/flutter/kernel/libraries.json" + libraries_specification_uri = + "org-dartlang-sdk:///topaz/runtime/flutter_runner/kernel/libraries.json" outputs = [ "$root_out_dir/flutter_runner_patched_sdk/platform_strong.dill", @@ -26,9 +30,29 @@ compile_platform("kernel_platform_files") { ] } -template("core_snapshot") { - suffix = "" +dart_kernel("framework_shim") { + platform_name = "flutter_runner" + platform_deps = + [ "//topaz/runtime/flutter_runner/kernel:kernel_platform_files" ] + platform_path = "$root_out_dir/flutter_runner_patched_sdk" + disable_analysis = true + gen_bytecode = true + args = [] + main_dart = "framework_shim.dart" + deps = [ + "//third_party/dart-pkg/git/flutter/packages/flutter", + ] + manifest = "$target_gen_dir/framework_shim.dilpmanifest" +} + +template("core_snapshot") { + assert(defined(invoker.product), + "core_snapshot requires 'product' to be defined") + assert(defined(invoker.framework), + "core_snapshot requires 'framework' to be defined") + + suffix = "" if (invoker.product) { suffix = "${suffix}_product" } @@ -36,15 +60,12 @@ template("core_snapshot") { suffix = "${suffix}_framework" } - compiled_action(target_name) { - deps = [ - ":kernel_platform_files", - ] + action(target_name) { + deps = gen_snapshot_deps + [ ":kernel_platform_files" ] platform_dill = "$root_out_dir/flutter_runner_patched_sdk/platform_strong.dill" - compilation_trace = - "$flutter_root/shell/platform/fuchsia/flutter/compilation_trace.txt" + compilation_trace = "//topaz/runtime/flutter_runner/compilation_trace.txt" inputs = [ platform_dill, compilation_trace, @@ -65,8 +86,11 @@ template("core_snapshot") { snapshot_profile, ] - tool = "//third_party/dart/runtime/bin:gen_snapshot" - + if (invoker.product) { + script = gen_snapshot_product + } else { + script = gen_snapshot + } args = [ # TODO(FL-117): Re-enable causal async stack traces when this issue is # addressed. @@ -88,8 +112,29 @@ template("core_snapshot") { rebase_path(snapshot_profile, root_build_dir), ] - args += [ "--enable_asserts" ] + # No asserts in debug or release product. + # No asserts in release with flutter_profile=true (non-product) + # Yes asserts in non-product debug. + if (!invoker.product && (!flutter_profile || is_debug)) { + args += [ "--enable_asserts" ] + } args += [ rebase_path(platform_dill) ] + + if (invoker.framework) { + if (prebuilt_framework_path == "") { + deps += [ ":framework_shim_kernel" ] + inputs += [ "$target_gen_dir/framework_shim_kernel.dil" ] + args += [ rebase_path("$target_gen_dir/framework_shim_kernel.dil") ] + } else { + deps += [ ":extract_prebuilt_framework" ] + foreach(package, framework_packages) { + args += [ rebase_path( + "$target_gen_dir/data/$prebuilt_framework_name/$package.dilp") ] + inputs += + [ "$target_gen_dir/data/$prebuilt_framework_name/$package.dilp" ] + } + } + } } } @@ -112,3 +157,53 @@ core_snapshot("kernel_core_snapshot_product_framework") { product = true framework = true } + +dart_tool("extract_far") { + main_dart = "extract_far.dart" + + force_prebuilt_dart = true + disable_analysis = true + + source_dir = "." + sources = [ + "extract_far.dart", + ] + + deps = [ + "//third_party/dart-pkg/pub/args", + ] +} + +if (prebuilt_framework_path != "") { + action("extract_prebuilt_framework") { + deps = [ + ":extract_far", + "//garnet/bin/far:host", + ] + + inputs = [ + prebuilt_framework_path, + ] + + script = get_label_info(":extract_far", "root_out_dir") + + "/dart-tools/extract_far" + args = [ + "--far-tool", + rebase_path("$host_tools_dir/far"), + "--archive", + rebase_path(prebuilt_framework_path), + "--out-dir", + rebase_path(target_gen_dir), + ] + + outputs = [] + foreach(package, framework_packages) { + args += [ "data/$prebuilt_framework_name/$package.dilp" ] + outputs += + [ "$target_gen_dir/data/$prebuilt_framework_name/$package.dilp" ] + } + args += [ "data/$prebuilt_framework_name/app.frameworkversion" ] + outputs += + [ "$target_gen_dir/data/$prebuilt_framework_name/app.frameworkversion" ] + } +} diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/kernel/libraries.json b/engine/src/flutter/shell/platform/fuchsia/flutter/kernel/libraries.json index 41c9c5d4d05..60561d4c9f5 100644 --- a/engine/src/flutter/shell/platform/fuchsia/flutter/kernel/libraries.json +++ b/engine/src/flutter/shell/platform/fuchsia/flutter/kernel/libraries.json @@ -1,160 +1,163 @@ { "comment:0": "NOTE: THIS FILE IS GENERATED. DO NOT EDIT.", - "comment:1": "Instead modify 'kernel/libraries.yaml' and follow the instructions therein.", + "comment:1": "Instead modify 'topaz/runtime/flutter_runner/kernel/libraries.yaml' and follow the instructions therein.", "flutter_runner": { "libraries": { "_builtin": { - "uri": "../../../../../../third_party/dart/runtime/bin/builtin.dart" + "uri": "../../../../third_party/dart/runtime/bin/builtin.dart" }, "core": { "patches": [ - "../../../../../../third_party/dart/runtime/lib/core_patch.dart", - "../../../../../../third_party/dart/runtime/lib/array.dart", - "../../../../../../third_party/dart/runtime/lib/array_patch.dart", - "../../../../../../third_party/dart/runtime/lib/bigint_patch.dart", - "../../../../../../third_party/dart/runtime/lib/bool_patch.dart", - "../../../../../../third_party/dart/runtime/lib/date_patch.dart", - "../../../../../../third_party/dart/runtime/lib/double.dart", - "../../../../../../third_party/dart/runtime/lib/double_patch.dart", - "../../../../../../third_party/dart/runtime/lib/errors_patch.dart", - "../../../../../../third_party/dart/runtime/lib/expando_patch.dart", - "../../../../../../third_party/dart/runtime/lib/function.dart", - "../../../../../../third_party/dart/runtime/lib/function_patch.dart", - "../../../../../../third_party/dart/runtime/lib/growable_array.dart", - "../../../../../../third_party/dart/runtime/lib/identical_patch.dart", - "../../../../../../third_party/dart/runtime/lib/immutable_map.dart", - "../../../../../../third_party/dart/runtime/lib/integers.dart", - "../../../../../../third_party/dart/runtime/lib/integers_patch.dart", - "../../../../../../third_party/dart/runtime/lib/invocation_mirror_patch.dart", - "../../../../../../third_party/dart/runtime/lib/lib_prefix.dart", - "../../../../../../third_party/dart/runtime/lib/map_patch.dart", - "../../../../../../third_party/dart/runtime/lib/null_patch.dart", - "../../../../../../third_party/dart/runtime/lib/object_patch.dart", - "../../../../../../third_party/dart/runtime/lib/regexp_patch.dart", - "../../../../../../third_party/dart/runtime/lib/stacktrace.dart", - "../../../../../../third_party/dart/runtime/lib/stopwatch_patch.dart", - "../../../../../../third_party/dart/runtime/lib/string_buffer_patch.dart", - "../../../../../../third_party/dart/runtime/lib/string_patch.dart", - "../../../../../../third_party/dart/runtime/lib/type_patch.dart", - "../../../../../../third_party/dart/runtime/lib/uri_patch.dart", - "../../../../../../third_party/dart/runtime/lib/weak_property.dart" + "../../../../third_party/dart/runtime/lib/core_patch.dart", + "../../../../third_party/dart/runtime/lib/array.dart", + "../../../../third_party/dart/runtime/lib/array_patch.dart", + "../../../../third_party/dart/runtime/lib/bigint_patch.dart", + "../../../../third_party/dart/runtime/lib/bool_patch.dart", + "../../../../third_party/dart/runtime/lib/date_patch.dart", + "../../../../third_party/dart/runtime/lib/double.dart", + "../../../../third_party/dart/runtime/lib/double_patch.dart", + "../../../../third_party/dart/runtime/lib/errors_patch.dart", + "../../../../third_party/dart/runtime/lib/expando_patch.dart", + "../../../../third_party/dart/runtime/lib/function.dart", + "../../../../third_party/dart/runtime/lib/function_patch.dart", + "../../../../third_party/dart/runtime/lib/growable_array.dart", + "../../../../third_party/dart/runtime/lib/identical_patch.dart", + "../../../../third_party/dart/runtime/lib/immutable_map.dart", + "../../../../third_party/dart/runtime/lib/integers.dart", + "../../../../third_party/dart/runtime/lib/integers_patch.dart", + "../../../../third_party/dart/runtime/lib/invocation_mirror_patch.dart", + "../../../../third_party/dart/runtime/lib/lib_prefix.dart", + "../../../../third_party/dart/runtime/lib/map_patch.dart", + "../../../../third_party/dart/runtime/lib/null_patch.dart", + "../../../../third_party/dart/runtime/lib/object_patch.dart", + "../../../../third_party/dart/runtime/lib/regexp_patch.dart", + "../../../../third_party/dart/runtime/lib/stacktrace.dart", + "../../../../third_party/dart/runtime/lib/stopwatch_patch.dart", + "../../../../third_party/dart/runtime/lib/string_buffer_patch.dart", + "../../../../third_party/dart/runtime/lib/string_patch.dart", + "../../../../third_party/dart/runtime/lib/type_patch.dart", + "../../../../third_party/dart/runtime/lib/uri_patch.dart", + "../../../../third_party/dart/runtime/lib/weak_property.dart" ], - "uri": "../../../../../../third_party/dart/sdk/lib/core/core.dart" + "uri": "../../../../third_party/dart/sdk/lib/core/core.dart" }, "zircon": { - "uri": "../../../../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/lib/zircon.dart" + "uri": "../../../../topaz/public/dart-pkg/zircon/lib/zircon.dart" }, "async": { "patches": [ - "../../../../../../third_party/dart/runtime/lib/async_patch.dart", - "../../../../../../third_party/dart/runtime/lib/deferred_load_patch.dart", - "../../../../../../third_party/dart/runtime/lib/schedule_microtask_patch.dart", - "../../../../../../third_party/dart/runtime/lib/timer_patch.dart" + "../../../../third_party/dart/runtime/lib/async_patch.dart", + "../../../../third_party/dart/runtime/lib/deferred_load_patch.dart", + "../../../../third_party/dart/runtime/lib/schedule_microtask_patch.dart", + "../../../../third_party/dart/runtime/lib/timer_patch.dart" ], - "uri": "../../../../../../third_party/dart/sdk/lib/async/async.dart" + "uri": "../../../../third_party/dart/sdk/lib/async/async.dart" + }, + "mozart.internal": { + "uri": "../../../../topaz/public/lib/ui/flutter/sdk_ext/mozart.dart" }, "collection": { "patches": [ - "../../../../../../third_party/dart/runtime/lib/collection_patch.dart", - "../../../../../../third_party/dart/runtime/lib/compact_hash.dart" + "../../../../third_party/dart/runtime/lib/collection_patch.dart", + "../../../../third_party/dart/runtime/lib/compact_hash.dart" ], - "uri": "../../../../../../third_party/dart/sdk/lib/collection/collection.dart" + "uri": "../../../../third_party/dart/sdk/lib/collection/collection.dart" }, "ffi": { "patches": [ - "../../../../../../third_party/dart/runtime/lib/ffi_dynamic_library_patch.dart", - "../../../../../../third_party/dart/runtime/lib/ffi_native_type_patch.dart", - "../../../../../../third_party/dart/runtime/lib/ffi_patch.dart" + "../../../../third_party/dart/runtime/lib/ffi_dynamic_library_patch.dart", + "../../../../third_party/dart/runtime/lib/ffi_native_type_patch.dart", + "../../../../third_party/dart/runtime/lib/ffi_patch.dart" ], - "uri": "../../../../../../third_party/dart/sdk/lib/ffi/ffi.dart" + "uri": "../../../../third_party/dart/sdk/lib/ffi/ffi.dart" }, "typed_data": { - "patches": "../../../../../../third_party/dart/runtime/lib/typed_data_patch.dart", - "uri": "../../../../../../third_party/dart/sdk/lib/typed_data/typed_data.dart" + "patches": "../../../../third_party/dart/runtime/lib/typed_data_patch.dart", + "uri": "../../../../third_party/dart/sdk/lib/typed_data/typed_data.dart" }, "nativewrappers": { - "uri": "../../../../../../third_party/dart/sdk/lib/html/dartium/nativewrappers.dart" + "uri": "../../../../third_party/dart/sdk/lib/html/dartium/nativewrappers.dart" }, "developer": { "patches": [ - "../../../../../../third_party/dart/runtime/lib/developer.dart", - "../../../../../../third_party/dart/runtime/lib/profiler.dart", - "../../../../../../third_party/dart/runtime/lib/timeline.dart" + "../../../../third_party/dart/runtime/lib/developer.dart", + "../../../../third_party/dart/runtime/lib/profiler.dart", + "../../../../third_party/dart/runtime/lib/timeline.dart" ], - "uri": "../../../../../../third_party/dart/sdk/lib/developer/developer.dart" + "uri": "../../../../third_party/dart/sdk/lib/developer/developer.dart" }, "isolate": { "patches": [ - "../../../../../../third_party/dart/runtime/lib/isolate_patch.dart", - "../../../../../../third_party/dart/runtime/lib/timer_impl.dart" + "../../../../third_party/dart/runtime/lib/isolate_patch.dart", + "../../../../third_party/dart/runtime/lib/timer_impl.dart" ], - "uri": "../../../../../../third_party/dart/sdk/lib/isolate/isolate.dart" + "uri": "../../../../third_party/dart/sdk/lib/isolate/isolate.dart" }, "mirrors": { "patches": [ - "../../../../../../third_party/dart/runtime/lib/mirrors_patch.dart", - "../../../../../../third_party/dart/runtime/lib/mirrors_impl.dart", - "../../../../../../third_party/dart/runtime/lib/mirror_reference.dart" + "../../../../third_party/dart/runtime/lib/mirrors_patch.dart", + "../../../../third_party/dart/runtime/lib/mirrors_impl.dart", + "../../../../third_party/dart/runtime/lib/mirror_reference.dart" ], - "uri": "../../../../../../third_party/dart/sdk/lib/mirrors/mirrors.dart" + "uri": "../../../../third_party/dart/sdk/lib/mirrors/mirrors.dart" }, "_vmservice": { - "uri": "../../../../../../third_party/dart/sdk/lib/vmservice/vmservice.dart" + "uri": "../../../../third_party/dart/sdk/lib/vmservice/vmservice.dart" }, "io": { "patches": [ - "../../../../../../third_party/dart/runtime/bin/common_patch.dart", - "../../../../../../third_party/dart/runtime/bin/directory_patch.dart", - "../../../../../../third_party/dart/runtime/bin/eventhandler_patch.dart", - "../../../../../../third_party/dart/runtime/bin/file_patch.dart", - "../../../../../../third_party/dart/runtime/bin/file_system_entity_patch.dart", - "../../../../../../third_party/dart/runtime/bin/filter_patch.dart", - "../../../../../../third_party/dart/runtime/bin/io_service_patch.dart", - "../../../../../../third_party/dart/runtime/bin/namespace_patch.dart", - "../../../../../../third_party/dart/runtime/bin/platform_patch.dart", - "../../../../../../third_party/dart/runtime/bin/process_patch.dart", - "../../../../../../third_party/dart/runtime/bin/socket_patch.dart", - "../../../../../../third_party/dart/runtime/bin/stdio_patch.dart", - "../../../../../../third_party/dart/runtime/bin/secure_socket_patch.dart", - "../../../../../../third_party/dart/runtime/bin/sync_socket_patch.dart" + "../../../../third_party/dart/runtime/bin/common_patch.dart", + "../../../../third_party/dart/runtime/bin/directory_patch.dart", + "../../../../third_party/dart/runtime/bin/eventhandler_patch.dart", + "../../../../third_party/dart/runtime/bin/file_patch.dart", + "../../../../third_party/dart/runtime/bin/file_system_entity_patch.dart", + "../../../../third_party/dart/runtime/bin/filter_patch.dart", + "../../../../third_party/dart/runtime/bin/io_service_patch.dart", + "../../../../third_party/dart/runtime/bin/namespace_patch.dart", + "../../../../third_party/dart/runtime/bin/platform_patch.dart", + "../../../../third_party/dart/runtime/bin/process_patch.dart", + "../../../../third_party/dart/runtime/bin/socket_patch.dart", + "../../../../third_party/dart/runtime/bin/stdio_patch.dart", + "../../../../third_party/dart/runtime/bin/secure_socket_patch.dart", + "../../../../third_party/dart/runtime/bin/sync_socket_patch.dart" ], - "uri": "../../../../../../third_party/dart/sdk/lib/io/io.dart" + "uri": "../../../../third_party/dart/sdk/lib/io/io.dart" }, "_internal": { "patches": [ - "../../../../../../third_party/dart/runtime/lib/internal_patch.dart", - "../../../../../../third_party/dart/runtime/lib/class_id_fasta.dart", - "../../../../../../third_party/dart/runtime/lib/print_patch.dart", - "../../../../../../third_party/dart/runtime/lib/symbol_patch.dart", - "../../../../../../third_party/dart/sdk/lib/internal/patch.dart" + "../../../../third_party/dart/runtime/lib/internal_patch.dart", + "../../../../third_party/dart/runtime/lib/class_id_fasta.dart", + "../../../../third_party/dart/runtime/lib/print_patch.dart", + "../../../../third_party/dart/runtime/lib/symbol_patch.dart", + "../../../../third_party/dart/sdk/lib/internal/patch.dart" ], - "uri": "../../../../../../third_party/dart/sdk/lib/internal/internal.dart" + "uri": "../../../../third_party/dart/sdk/lib/internal/internal.dart" }, "convert": { - "patches": "../../../../../../third_party/dart/runtime/lib/convert_patch.dart", - "uri": "../../../../../../third_party/dart/sdk/lib/convert/convert.dart" + "patches": "../../../../third_party/dart/runtime/lib/convert_patch.dart", + "uri": "../../../../third_party/dart/sdk/lib/convert/convert.dart" }, "profiler": { - "uri": "../../../../../../third_party/dart/sdk/lib/profiler/profiler.dart" + "uri": "../../../../third_party/dart/sdk/lib/profiler/profiler.dart" }, "math": { - "patches": "../../../../../../third_party/dart/runtime/lib/math_patch.dart", - "uri": "../../../../../../third_party/dart/sdk/lib/math/math.dart" + "patches": "../../../../third_party/dart/runtime/lib/math_patch.dart", + "uri": "../../../../third_party/dart/sdk/lib/math/math.dart" }, "_http": { - "uri": "../../../../../../third_party/dart/sdk/lib/_http/http.dart" + "uri": "../../../../third_party/dart/sdk/lib/_http/http.dart" }, "fuchsia": { - "uri": "../../../../../../flutter/shell/platform/fuchsia/dart-pkg/fuchsia/lib/fuchsia.dart" + "uri": "../../../../topaz/public/dart-pkg/fuchsia/lib/fuchsia.dart" }, "fuchsia.builtin": { - "uri": "../../../../../../flutter/shell/platform/fuchsia/dart/embedder/builtin.dart" + "uri": "../../../../topaz/runtime/dart_runner/embedder/builtin.dart" }, "ui": { - "uri": "../../../../../../flutter/lib/ui/ui.dart" + "uri": "../../../../third_party/flutter/lib/ui/ui.dart" }, "vmservice_io": { - "uri": "../../../../../../third_party/dart/runtime/bin/vmservice/vmservice_io.dart" + "uri": "../../../../third_party/dart/runtime/bin/vmservice/vmservice_io.dart" } } } diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/kernel/libraries.yaml b/engine/src/flutter/shell/platform/fuchsia/flutter/kernel/libraries.yaml index 567d9e412d8..7e52140c0df 100644 --- a/engine/src/flutter/shell/platform/fuchsia/flutter/kernel/libraries.yaml +++ b/engine/src/flutter/shell/platform/fuchsia/flutter/kernel/libraries.yaml @@ -1,11 +1,13 @@ -# Copyright (c) 2017, the Dart project authors. Please see the AUTHORS file +# Copyright (c) 2018, the Dart project authors. Please see the AUTHORS file # for details. All rights reserved. Use of this source code is governed by a # BSD-style license that can be found in the LICENSE file. # Note: if you edit this file, you must also edit libraries.json in this # directory: # -# python third_party/dart/tools/yaml2json.py /libraries.yaml /libraries.json +# python third_party/dart/tools/yaml2json.py \ +# topaz/runtime/flutter_runner/kernel/libraries.yaml \ +# topaz/runtime/flutter_runner/kernel/libraries.json # # We currently have several different files that needs to be updated when # changing libraries, sources, and patch files. See @@ -14,145 +16,148 @@ flutter_runner: libraries: _builtin: - uri: "../../../../../../third_party/dart/runtime/bin/builtin.dart" + uri: "../../../../third_party/dart/runtime/bin/builtin.dart" _internal: - uri: "../../../../../../third_party/dart/sdk/lib/internal/internal.dart" + uri: "../../../../third_party/dart/sdk/lib/internal/internal.dart" patches: - - "../../../../../../third_party/dart/runtime/lib/internal_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/class_id_fasta.dart" - - "../../../../../../third_party/dart/runtime/lib/print_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/symbol_patch.dart" - - "../../../../../../third_party/dart/sdk/lib/internal/patch.dart" + - "../../../../third_party/dart/runtime/lib/internal_patch.dart" + - "../../../../third_party/dart/runtime/lib/class_id_fasta.dart" + - "../../../../third_party/dart/runtime/lib/print_patch.dart" + - "../../../../third_party/dart/runtime/lib/symbol_patch.dart" + - "../../../../third_party/dart/sdk/lib/internal/patch.dart" async: - uri: "../../../../../../third_party/dart/sdk/lib/async/async.dart" + uri: "../../../../third_party/dart/sdk/lib/async/async.dart" patches: - - "../../../../../../third_party/dart/runtime/lib/async_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/deferred_load_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/schedule_microtask_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/timer_patch.dart" + - "../../../../third_party/dart/runtime/lib/async_patch.dart" + - "../../../../third_party/dart/runtime/lib/deferred_load_patch.dart" + - "../../../../third_party/dart/runtime/lib/schedule_microtask_patch.dart" + - "../../../../third_party/dart/runtime/lib/timer_patch.dart" collection: - uri: "../../../../../../third_party/dart/sdk/lib/collection/collection.dart" + uri: "../../../../third_party/dart/sdk/lib/collection/collection.dart" patches: - - "../../../../../../third_party/dart/runtime/lib/collection_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/compact_hash.dart" + - "../../../../third_party/dart/runtime/lib/collection_patch.dart" + - "../../../../third_party/dart/runtime/lib/compact_hash.dart" convert: - uri: "../../../../../../third_party/dart/sdk/lib/convert/convert.dart" - patches: "../../../../../../third_party/dart/runtime/lib/convert_patch.dart" + uri: "../../../../third_party/dart/sdk/lib/convert/convert.dart" + patches: "../../../../third_party/dart/runtime/lib/convert_patch.dart" core: - uri: "../../../../../../third_party/dart/sdk/lib/core/core.dart" + uri: "../../../../third_party/dart/sdk/lib/core/core.dart" patches: - - "../../../../../../third_party/dart/runtime/lib/core_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/array.dart" - - "../../../../../../third_party/dart/runtime/lib/array_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/bigint_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/bool_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/date_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/double.dart" - - "../../../../../../third_party/dart/runtime/lib/double_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/errors_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/expando_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/function.dart" - - "../../../../../../third_party/dart/runtime/lib/function_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/growable_array.dart" - - "../../../../../../third_party/dart/runtime/lib/identical_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/immutable_map.dart" - - "../../../../../../third_party/dart/runtime/lib/integers.dart" - - "../../../../../../third_party/dart/runtime/lib/integers_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/invocation_mirror_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/lib_prefix.dart" - - "../../../../../../third_party/dart/runtime/lib/map_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/null_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/object_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/regexp_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/stacktrace.dart" - - "../../../../../../third_party/dart/runtime/lib/stopwatch_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/string_buffer_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/string_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/type_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/uri_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/weak_property.dart" + - "../../../../third_party/dart/runtime/lib/core_patch.dart" + - "../../../../third_party/dart/runtime/lib/array.dart" + - "../../../../third_party/dart/runtime/lib/array_patch.dart" + - "../../../../third_party/dart/runtime/lib/bigint_patch.dart" + - "../../../../third_party/dart/runtime/lib/bool_patch.dart" + - "../../../../third_party/dart/runtime/lib/date_patch.dart" + - "../../../../third_party/dart/runtime/lib/double.dart" + - "../../../../third_party/dart/runtime/lib/double_patch.dart" + - "../../../../third_party/dart/runtime/lib/errors_patch.dart" + - "../../../../third_party/dart/runtime/lib/expando_patch.dart" + - "../../../../third_party/dart/runtime/lib/function.dart" + - "../../../../third_party/dart/runtime/lib/function_patch.dart" + - "../../../../third_party/dart/runtime/lib/growable_array.dart" + - "../../../../third_party/dart/runtime/lib/identical_patch.dart" + - "../../../../third_party/dart/runtime/lib/immutable_map.dart" + - "../../../../third_party/dart/runtime/lib/integers.dart" + - "../../../../third_party/dart/runtime/lib/integers_patch.dart" + - "../../../../third_party/dart/runtime/lib/invocation_mirror_patch.dart" + - "../../../../third_party/dart/runtime/lib/lib_prefix.dart" + - "../../../../third_party/dart/runtime/lib/map_patch.dart" + - "../../../../third_party/dart/runtime/lib/null_patch.dart" + - "../../../../third_party/dart/runtime/lib/object_patch.dart" + - "../../../../third_party/dart/runtime/lib/regexp_patch.dart" + - "../../../../third_party/dart/runtime/lib/stacktrace.dart" + - "../../../../third_party/dart/runtime/lib/stopwatch_patch.dart" + - "../../../../third_party/dart/runtime/lib/string_buffer_patch.dart" + - "../../../../third_party/dart/runtime/lib/string_patch.dart" + - "../../../../third_party/dart/runtime/lib/type_patch.dart" + - "../../../../third_party/dart/runtime/lib/uri_patch.dart" + - "../../../../third_party/dart/runtime/lib/weak_property.dart" developer: - uri: "../../../../../../third_party/dart/sdk/lib/developer/developer.dart" + uri: "../../../../third_party/dart/sdk/lib/developer/developer.dart" patches: - - "../../../../../../third_party/dart/runtime/lib/developer.dart" - - "../../../../../../third_party/dart/runtime/lib/profiler.dart" - - "../../../../../../third_party/dart/runtime/lib/timeline.dart" + - "../../../../third_party/dart/runtime/lib/developer.dart" + - "../../../../third_party/dart/runtime/lib/profiler.dart" + - "../../../../third_party/dart/runtime/lib/timeline.dart" ffi: - uri: "../../../../../../third_party/dart/sdk/lib/ffi/ffi.dart" + uri: "../../../../third_party/dart/sdk/lib/ffi/ffi.dart" patches: - - "../../../../../../third_party/dart/runtime/lib/ffi_dynamic_library_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/ffi_native_type_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/ffi_patch.dart" + - "../../../../third_party/dart/runtime/lib/ffi_dynamic_library_patch.dart" + - "../../../../third_party/dart/runtime/lib/ffi_native_type_patch.dart" + - "../../../../third_party/dart/runtime/lib/ffi_patch.dart" _http: - uri: "../../../../../../third_party/dart/sdk/lib/_http/http.dart" + uri: "../../../../third_party/dart/sdk/lib/_http/http.dart" io: - uri: "../../../../../../third_party/dart/sdk/lib/io/io.dart" + uri: "../../../../third_party/dart/sdk/lib/io/io.dart" patches: - - "../../../../../../third_party/dart/runtime/bin/common_patch.dart" - - "../../../../../../third_party/dart/runtime/bin/directory_patch.dart" - - "../../../../../../third_party/dart/runtime/bin/eventhandler_patch.dart" - - "../../../../../../third_party/dart/runtime/bin/file_patch.dart" - - "../../../../../../third_party/dart/runtime/bin/file_system_entity_patch.dart" - - "../../../../../../third_party/dart/runtime/bin/filter_patch.dart" - - "../../../../../../third_party/dart/runtime/bin/io_service_patch.dart" - - "../../../../../../third_party/dart/runtime/bin/namespace_patch.dart" - - "../../../../../../third_party/dart/runtime/bin/platform_patch.dart" - - "../../../../../../third_party/dart/runtime/bin/process_patch.dart" - - "../../../../../../third_party/dart/runtime/bin/socket_patch.dart" - - "../../../../../../third_party/dart/runtime/bin/stdio_patch.dart" - - "../../../../../../third_party/dart/runtime/bin/secure_socket_patch.dart" - - "../../../../../../third_party/dart/runtime/bin/sync_socket_patch.dart" + - "../../../../third_party/dart/runtime/bin/common_patch.dart" + - "../../../../third_party/dart/runtime/bin/directory_patch.dart" + - "../../../../third_party/dart/runtime/bin/eventhandler_patch.dart" + - "../../../../third_party/dart/runtime/bin/file_patch.dart" + - "../../../../third_party/dart/runtime/bin/file_system_entity_patch.dart" + - "../../../../third_party/dart/runtime/bin/filter_patch.dart" + - "../../../../third_party/dart/runtime/bin/io_service_patch.dart" + - "../../../../third_party/dart/runtime/bin/namespace_patch.dart" + - "../../../../third_party/dart/runtime/bin/platform_patch.dart" + - "../../../../third_party/dart/runtime/bin/process_patch.dart" + - "../../../../third_party/dart/runtime/bin/socket_patch.dart" + - "../../../../third_party/dart/runtime/bin/stdio_patch.dart" + - "../../../../third_party/dart/runtime/bin/secure_socket_patch.dart" + - "../../../../third_party/dart/runtime/bin/sync_socket_patch.dart" isolate: - uri: "../../../../../../third_party/dart/sdk/lib/isolate/isolate.dart" + uri: "../../../../third_party/dart/sdk/lib/isolate/isolate.dart" patches: - - "../../../../../../third_party/dart/runtime/lib/isolate_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/timer_impl.dart" + - "../../../../third_party/dart/runtime/lib/isolate_patch.dart" + - "../../../../third_party/dart/runtime/lib/timer_impl.dart" math: - uri: "../../../../../../third_party/dart/sdk/lib/math/math.dart" - patches: "../../../../../../third_party/dart/runtime/lib/math_patch.dart" + uri: "../../../../third_party/dart/sdk/lib/math/math.dart" + patches: "../../../../third_party/dart/runtime/lib/math_patch.dart" mirrors: - uri: "../../../../../../third_party/dart/sdk/lib/mirrors/mirrors.dart" + uri: "../../../../third_party/dart/sdk/lib/mirrors/mirrors.dart" patches: - - "../../../../../../third_party/dart/runtime/lib/mirrors_patch.dart" - - "../../../../../../third_party/dart/runtime/lib/mirrors_impl.dart" - - "../../../../../../third_party/dart/runtime/lib/mirror_reference.dart" + - "../../../../third_party/dart/runtime/lib/mirrors_patch.dart" + - "../../../../third_party/dart/runtime/lib/mirrors_impl.dart" + - "../../../../third_party/dart/runtime/lib/mirror_reference.dart" nativewrappers: - uri: "../../../../../../third_party/dart/sdk/lib/html/dartium/nativewrappers.dart" + uri: "../../../../third_party/dart/sdk/lib/html/dartium/nativewrappers.dart" profiler: - uri: "../../../../../../third_party/dart/sdk/lib/profiler/profiler.dart" + uri: "../../../../third_party/dart/sdk/lib/profiler/profiler.dart" typed_data: - uri: "../../../../../../third_party/dart/sdk/lib/typed_data/typed_data.dart" - patches: "../../../../../../third_party/dart/runtime/lib/typed_data_patch.dart" + uri: "../../../../third_party/dart/sdk/lib/typed_data/typed_data.dart" + patches: "../../../../third_party/dart/runtime/lib/typed_data_patch.dart" fuchsia.builtin: - uri: "../../../../../../flutter/shell/platform/fuchsia/dart/embedder/builtin.dart" + uri: "../../../../topaz/runtime/dart_runner/embedder/builtin.dart" zircon: - uri: "../../../../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/lib/zircon.dart" + uri: "../../../../topaz/public/dart-pkg/zircon/lib/zircon.dart" fuchsia: - uri: "../../../../../../flutter/shell/platform/fuchsia/dart-pkg/fuchsia/lib/fuchsia.dart" + uri: "../../../../topaz/public/dart-pkg/fuchsia/lib/fuchsia.dart" ui: - uri: "../../../../../../flutter/lib/ui/ui.dart" + uri: "../../../../third_party/flutter/lib/ui/ui.dart" + + mozart.internal: + uri: "../../../../topaz/public/lib/ui/flutter/sdk_ext/mozart.dart" _vmservice: - uri: "../../../../../../third_party/dart/sdk/lib/vmservice/vmservice.dart" + uri: "../../../../third_party/dart/sdk/lib/vmservice/vmservice.dart" vmservice_io: - uri: "../../../../../../third_party/dart/runtime/bin/vmservice/vmservice_io.dart" + uri: "../../../../third_party/dart/runtime/bin/vmservice/vmservice_io.dart"