diff --git a/BUILD.gn b/BUILD.gn index a320299636089..248524f872551 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -3,7 +3,6 @@ # found in the LICENSE file. import("$flutter_root/common/config.gni") -import("//third_party/dart/build/dart/dart_action.gni") group("flutter") { testonly = true @@ -24,7 +23,7 @@ group("flutter") { public_deps += [ "$flutter_root/frontend_server", "//third_party/dart:create_sdk", - "$flutter_root/lib/stub_ui:stub_ui", + "$flutter_root/web_sdk", ] } } diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter index 038903489a3f8..a73eae28ef67d 100644 --- a/ci/licenses_golden/licenses_flutter +++ b/ci/licenses_golden/licenses_flutter @@ -251,7 +251,6 @@ FILE: ../../../flutter/lib/stub_ui/hash_codes.dart FILE: ../../../flutter/lib/stub_ui/hooks.dart FILE: ../../../flutter/lib/stub_ui/isolate_name_server.dart FILE: ../../../flutter/lib/stub_ui/lerp.dart -FILE: ../../../flutter/lib/stub_ui/libraries.json FILE: ../../../flutter/lib/stub_ui/natives.dart FILE: ../../../flutter/lib/stub_ui/painting.dart FILE: ../../../flutter/lib/stub_ui/plugins.dart @@ -704,6 +703,7 @@ FILE: ../../../flutter/vulkan/vulkan_utilities.cc FILE: ../../../flutter/vulkan/vulkan_utilities.h FILE: ../../../flutter/vulkan/vulkan_window.cc FILE: ../../../flutter/vulkan/vulkan_window.h +FILE: ../../../flutter/web_sdk/libraries.json ---------------------------------------------------------------------------------------------------- Copyright 2013 The Flutter Authors. All rights reserved. diff --git a/lib/snapshot/libraries.json b/lib/snapshot/libraries.json index bc3d0d832c952..99ef4cd778f8c 100644 --- a/lib/snapshot/libraries.json +++ b/lib/snapshot/libraries.json @@ -1,123 +1,6 @@ { "comment:0": "NOTE: THIS FILE IS GENERATED. DO NOT EDIT.", "comment:1": "Instead modify 'flutter/lib/snapshot/libraries.yaml' and follow the instructions therein.", - "none": { - "libraries": {} - }, - "dartdevc": { - "libraries": { - "async": { - "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/async_patch.dart", - "uri": "../../../third_party/dart/sdk/lib/async/async.dart" - }, - "_runtime": { - "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/ddc_runtime/runtime.dart" - }, - "_interceptors": { - "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/interceptors.dart" - }, - "mirrors": { - "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/mirrors_patch.dart", - "supported": false, - "uri": "../../../third_party/dart/sdk/lib/mirrors/mirrors.dart" - }, - "_debugger": { - "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/debugger.dart" - }, - "io": { - "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/io_patch.dart", - "supported": false, - "uri": "../../../third_party/dart/sdk/lib/io/io.dart" - }, - "_internal": { - "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/internal_patch.dart", - "uri": "../../../third_party/dart/sdk/lib/internal/internal.dart" - }, - "_metadata": { - "uri": "../../../third_party/dart/sdk/lib/html/html_common/metadata.dart" - }, - "_http": { - "uri": "../../../third_party/dart/sdk/lib/_http/http.dart" - }, - "_js_primitives": { - "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/js_primitives.dart" - }, - "_js_helper": { - "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/js_helper.dart" - }, - "ui": { - "uri": "flutter/lib/stub_ui/ui.dart" - }, - "js": { - "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/lib/js/dart2js/js_dart2js.dart" - }, - "_js_mirrors": { - "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/js_mirrors.dart" - }, - "html_common": { - "uri": "../../../third_party/dart/sdk/lib/html/html_common/html_common_dart2js.dart" - }, - "_native_typed_data": { - "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/native_typed_data.dart" - }, - "core": { - "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/core_patch.dart", - "uri": "../../../third_party/dart/sdk/lib/core/core.dart" - }, - "js_util": { - "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/lib/js_util/dart2js/js_util_dart2js.dart" - }, - "collection": { - "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/collection_patch.dart", - "uri": "../../../third_party/dart/sdk/lib/collection/collection.dart" - }, - "typed_data": { - "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/typed_data_patch.dart", - "uri": "../../../third_party/dart/sdk/lib/typed_data/typed_data.dart" - }, - "web_audio": { - "uri": "../../../third_party/dart/sdk/lib/web_audio/dart2js/web_audio_dart2js.dart" - }, - "html": { - "uri": "../../../third_party/dart/sdk/lib/html/dart2js/html_dart2js.dart" - }, - "developer": { - "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/developer_patch.dart", - "uri": "../../../third_party/dart/sdk/lib/developer/developer.dart" - }, - "isolate": { - "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/isolate_patch.dart", - "supported": false, - "uri": "../../../third_party/dart/sdk/lib/isolate/isolate.dart" - }, - "web_gl": { - "uri": "../../../third_party/dart/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart" - }, - "indexed_db": { - "uri": "../../../third_party/dart/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart" - }, - "convert": { - "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/convert_patch.dart", - "uri": "../../../third_party/dart/sdk/lib/convert/convert.dart" - }, - "_isolate_helper": { - "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/isolate_helper.dart" - }, - "math": { - "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/math_patch.dart", - "uri": "../../../third_party/dart/sdk/lib/math/math.dart" - }, - "_foreign_helper": { - "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/foreign_helper.dart" - }, - "web_sql": { - "uri": "../../../third_party/dart/sdk/lib/web_sql/dart2js/web_sql_dart2js.dart" - }, - "svg": { - "uri": "../../../third_party/dart/sdk/lib/svg/dart2js/svg_dart2js.dart" - } - } - }, "flutter": { "libraries": { "_builtin": { diff --git a/lib/snapshot/libraries.yaml b/lib/snapshot/libraries.yaml index cb65d57bd7b8b..c4244eaff8719 100644 --- a/lib/snapshot/libraries.yaml +++ b/lib/snapshot/libraries.yaml @@ -11,9 +11,6 @@ # changing libraries, sources, and patch files. See # https://github.com/dart-lang/sdk/issues/28836. -none: - libraries: {} - flutter: libraries: _builtin: @@ -150,115 +147,3 @@ flutter: vmservice_io: uri: "../../../third_party/dart/runtime/bin/vmservice/vmservice_io.dart" - -dartdevc: - libraries: - _runtime: - uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/ddc_runtime/runtime.dart" - - _debugger: - uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/debugger.dart" - - _foreign_helper: - uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/foreign_helper.dart" - - _http: - uri: "../../../third_party/dart/sdk/lib/_http/http.dart" - - _interceptors: - uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/interceptors.dart" - - _internal: - uri: "../../../third_party/dart/sdk/lib/internal/internal.dart" - patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/internal_patch.dart" - - _isolate_helper: - uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/isolate_helper.dart" - - _js_helper: - uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/js_helper.dart" - - _js_mirrors: - uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/js_mirrors.dart" - - _js_primitives: - uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/js_primitives.dart" - - _metadata: - uri: "../../../third_party/dart/sdk/lib/html/html_common/metadata.dart" - - _native_typed_data: - uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/native_typed_data.dart" - - async: - uri: "../../../third_party/dart/sdk/lib/async/async.dart" - patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/async_patch.dart" - - collection: - uri: "../../../third_party/dart/sdk/lib/collection/collection.dart" - patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/collection_patch.dart" - - convert: - uri: "../../../third_party/dart/sdk/lib/convert/convert.dart" - patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/convert_patch.dart" - - core: - uri: "../../../third_party/dart/sdk/lib/core/core.dart" - patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/core_patch.dart" - - developer: - uri: "../../../third_party/dart/sdk/lib/developer/developer.dart" - patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/developer_patch.dart" - - io: - uri: "../../../third_party/dart/sdk/lib/io/io.dart" - patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/io_patch.dart" - supported: false - - isolate: - uri: "../../../third_party/dart/sdk/lib/isolate/isolate.dart" - patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/isolate_patch.dart" - supported: false - - mirrors: - uri: "../../../third_party/dart/sdk/lib/mirrors/mirrors.dart" - patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/mirrors_patch.dart" - supported: false - - math: - uri: "../../../third_party/dart/sdk/lib/math/math.dart" - patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/math_patch.dart" - - typed_data: - uri: "../../../third_party/dart/sdk/lib/typed_data/typed_data.dart" - patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/typed_data_patch.dart" - - html: - uri: "../../../third_party/dart/sdk/lib/html/dart2js/html_dart2js.dart" - - html_common: - uri: "../../../third_party/dart/sdk/lib/html/html_common/html_common_dart2js.dart" - - indexed_db: - uri: "../../../third_party/dart/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart" - - js: - uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/lib/js/dart2js/js_dart2js.dart" - - js_util: - uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/lib/js_util/dart2js/js_util_dart2js.dart" - - svg: - uri: "../../../third_party/dart/sdk/lib/svg/dart2js/svg_dart2js.dart" - - web_audio: - uri: "../../../third_party/dart/sdk/lib/web_audio/dart2js/web_audio_dart2js.dart" - - web_gl: - uri: "../../../third_party/dart/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart" - - web_sql: - uri: "../../../third_party/dart/sdk/lib/web_sql/dart2js/web_sql_dart2js.dart" - - ui: - uri: "flutter/lib/stub_ui/ui.dart" diff --git a/lib/stub_ui/BUILD.gn b/lib/stub_ui/BUILD.gn deleted file mode 100644 index 218f0344083df..0000000000000 --- a/lib/stub_ui/BUILD.gn +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 2019 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -copy("stub_ui") { - sources = [ - "compositing.dart", - "geometry.dart", - "hash_codes.dart", - "hooks.dart", - "isolate_name_server.dart", - "lerp.dart", - "natives.dart", - "painting.dart", - "plugins.dart", - "pointer.dart", - "semantics.dart", - "text.dart", - "ui.dart", - "versions.dart", - "window.dart", - ] - - deps = [ - ":stub_libraries", - ] - - outputs = [ - "$root_out_dir/flutter_patched_sdk/stub_ui/{{source_file_part}}" - ] -} - -copy("stub_libraries") { - sources = [ - "$flutter_root/lib/stub_ui/libraries.json" - ] - - outputs = [ - "$root_out_dir/flutter_patched_sdk/libraries.json" - ] -} diff --git a/lib/stub_ui/libraries.json b/lib/stub_ui/libraries.json deleted file mode 100644 index 60313c4ce6cbc..0000000000000 --- a/lib/stub_ui/libraries.json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "comment:0": "NOTE: THIS FILE IS GENERATED. DO NOT EDIT.", - "comment:1": "Instead modify 'flutter/lib/stub_ui/libraries.yaml' and follow the instructions therein.", - "dart2js": { - "libraries": { - "async": { - "patches": "../../../../dart-sdk/lib/_internal/js_runtime/lib/async_patch.dart", - "uri": "../../../../dart-sdk/lib/async/async.dart" - }, - "_interceptors": { - "uri": "../../../../dart-sdk/lib/_internal/js_runtime/lib/interceptors.dart" - }, - "mirrors": { - "patches": "../../../../dart-sdk/lib/_internal/js_runtime/lib/mirrors_patch_cfe.dart", - "supported": false, - "uri": "../../../../dart-sdk/lib/mirrors/mirrors.dart" - }, - "_js_embedded_names": { - "uri": "../../../../dart-sdk/lib/_internal/js_runtime/lib/shared/embedded_names.dart" - }, - "io": { - "patches": "../../../../dart-sdk/lib/_internal/js_runtime/lib/io_patch.dart", - "supported": false, - "uri": "../../../../dart-sdk/lib/io/io.dart" - }, - "_internal": { - "patches": "../../../../dart-sdk/lib/_internal/js_runtime/lib/internal_patch.dart", - "uri": "../../../../dart-sdk/lib/internal/internal.dart" - }, - "_metadata": { - "uri": "../../../../dart-sdk/lib/html/html_common/metadata.dart" - }, - "_async_await_error_codes": { - "uri": "../../../../dart-sdk/lib/_internal/js_runtime/lib/shared/async_await_error_codes.dart" - }, - "_http": { - "uri": "../../../../dart-sdk/lib/_http/http.dart" - }, - "_js_primitives": { - "uri": "../../../../dart-sdk/lib/_internal/js_runtime/lib/js_primitives.dart" - }, - "_js_helper": { - "uri": "../../../../dart-sdk/lib/_internal/js_runtime/lib/js_helper.dart" - }, - "_chrome": { - "uri": "../../../../dart-sdk/lib/_chrome/dart2js/chrome_dart2js.dart" - }, - "html_common": { - "uri": "../../../../dart-sdk/lib/html/html_common/html_common_dart2js.dart" - }, - "ui": { - "uri": "stub_ui/ui.dart" - }, - "js": { - "uri": "../../../../dart-sdk/lib/js/dart2js/js_dart2js.dart" - }, - "_native_typed_data": { - "uri": "../../../../dart-sdk/lib/_internal/js_runtime/lib/native_typed_data.dart" - }, - "_js_names": { - "uri": "../../../../dart-sdk/lib/_internal/js_runtime/lib/js_names.dart" - }, - "core": { - "patches": "../../../../dart-sdk/lib/_internal/js_runtime/lib/core_patch.dart", - "uri": "../../../../dart-sdk/lib/core/core.dart" - }, - "collection": { - "patches": "../../../../dart-sdk/lib/_internal/js_runtime/lib/collection_patch.dart", - "uri": "../../../../dart-sdk/lib/collection/collection.dart" - }, - "js_util": { - "uri": "../../../../dart-sdk/lib/js_util/dart2js/js_util_dart2js.dart" - }, - "typed_data": { - "patches": "../../../../dart-sdk/lib/_internal/js_runtime/lib/typed_data_patch.dart", - "uri": "../../../../dart-sdk/lib/typed_data/typed_data.dart" - }, - "web_audio": { - "uri": "../../../../dart-sdk/lib/web_audio/dart2js/web_audio_dart2js.dart" - }, - "html": { - "uri": "../../../../dart-sdk/lib/html/dart2js/html_dart2js.dart" - }, - "isolate": { - "patches": "../../../../dart-sdk/lib/_internal/js_runtime/lib/isolate_patch.dart", - "supported": false, - "uri": "../../../../dart-sdk/lib/isolate/isolate.dart" - }, - "developer": { - "patches": "../../../../dart-sdk/lib/_internal/js_runtime/lib/developer_patch.dart", - "uri": "../../../../dart-sdk/lib/developer/developer.dart" - }, - "web_gl": { - "uri": "../../../../dart-sdk/lib/web_gl/dart2js/web_gl_dart2js.dart" - }, - "indexed_db": { - "uri": "../../../../dart-sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart" - }, - "_js": { - "patches": "../../../../dart-sdk/lib/js/_js_client.dart", - "uri": "../../../../dart-sdk/lib/js/_js.dart" - }, - "convert": { - "patches": "../../../../dart-sdk/lib/_internal/js_runtime/lib/convert_patch.dart", - "uri": "../../../../dart-sdk/lib/convert/convert.dart" - }, - "math": { - "patches": "../../../../dart-sdk/lib/_internal/js_runtime/lib/math_patch.dart", - "uri": "../../../../dart-sdk/lib/math/math.dart" - }, - "_foreign_helper": { - "uri": "../../../../dart-sdk/lib/_internal/js_runtime/lib/foreign_helper.dart" - }, - "web_sql": { - "uri": "../../../../dart-sdk/lib/web_sql/dart2js/web_sql_dart2js.dart" - }, - "svg": { - "uri": "../../../../dart-sdk/lib/svg/dart2js/svg_dart2js.dart" - } - } - } -} \ No newline at end of file diff --git a/lib/stub_ui/libraries.yaml b/lib/stub_ui/libraries.yaml deleted file mode 100644 index aded84171f6e5..0000000000000 --- a/lib/stub_ui/libraries.yaml +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright (c) 2017, 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 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 -# https://github.com/dart-lang/sdk/issues/28836. - -dart2js: - libraries: - ui: - uri: "stub_ui/ui.dart" - - async: - uri: "../../../../dart-sdk/lib/async/async.dart" - patches: "../../../../dart-sdk/lib/_internal/js_runtime/lib/async_patch.dart" - - _chrome: - uri: "../../../../dart-sdk/lib/_chrome/dart2js/chrome_dart2js.dart" - - collection: - uri: "../../../../dart-sdk/lib/collection/collection.dart" - patches: "../../../../dart-sdk/lib/_internal/js_runtime/lib/collection_patch.dart" - - convert: - uri: "../../../../dart-sdk/lib/convert/convert.dart" - patches: "../../../../dart-sdk/lib/_internal/js_runtime/lib/convert_patch.dart" - - core: - uri: "../../../../dart-sdk/lib/core/core.dart" - patches: "../../../../dart-sdk/lib/_internal/js_runtime/lib/core_patch.dart" - - developer: - uri: "../../../../dart-sdk/lib/developer/developer.dart" - patches: "../../../../dart-sdk/lib/_internal/js_runtime/lib/developer_patch.dart" - - html: - uri: "../../../../dart-sdk/lib/html/dart2js/html_dart2js.dart" - - html_common: - uri: "../../../../dart-sdk/lib/html/html_common/html_common_dart2js.dart" - - indexed_db: - uri: "../../../../dart-sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart" - - _http: - uri: "../../../../dart-sdk/lib/_http/http.dart" - - io: - uri: "../../../../dart-sdk/lib/io/io.dart" - patches: "../../../../dart-sdk/lib/_internal/js_runtime/lib/io_patch.dart" - supported: false - - isolate: - uri: "../../../../dart-sdk/lib/isolate/isolate.dart" - patches: "../../../../dart-sdk/lib/_internal/js_runtime/lib/isolate_patch.dart" - supported: false - - js: - uri: "../../../../dart-sdk/lib/js/dart2js/js_dart2js.dart" - - _js: - uri: "../../../../dart-sdk/lib/js/_js.dart" - patches: "../../../../dart-sdk/lib/js/_js_client.dart" - - js_util: - uri: "../../../../dart-sdk/lib/js_util/dart2js/js_util_dart2js.dart" - - math: - uri: "../../../../dart-sdk/lib/math/math.dart" - patches: "../../../../dart-sdk/lib/_internal/js_runtime/lib/math_patch.dart" - - mirrors: - uri: "../../../../dart-sdk/lib/mirrors/mirrors.dart" - patches: "../../../../dart-sdk/lib/_internal/js_runtime/lib/mirrors_patch_cfe.dart" - supported: false - - typed_data: - uri: "../../../../dart-sdk/lib/typed_data/typed_data.dart" - patches: "../../../../dart-sdk/lib/_internal/js_runtime/lib/typed_data_patch.dart" - - _native_typed_data: - uri: "../../../../dart-sdk/lib/_internal/js_runtime/lib/native_typed_data.dart" - - svg: - uri: "../../../../dart-sdk/lib/svg/dart2js/svg_dart2js.dart" - - web_audio: - uri: "../../../../dart-sdk/lib/web_audio/dart2js/web_audio_dart2js.dart" - - web_gl: - uri: "../../../../dart-sdk/lib/web_gl/dart2js/web_gl_dart2js.dart" - - web_sql: - uri: "../../../../dart-sdk/lib/web_sql/dart2js/web_sql_dart2js.dart" - - _internal: - uri: "../../../../dart-sdk/lib/internal/internal.dart" - patches: "../../../../dart-sdk/lib/_internal/js_runtime/lib/internal_patch.dart" - - _js_helper: - uri: "../../../../dart-sdk/lib/_internal/js_runtime/lib/js_helper.dart" - - _interceptors: - uri: "../../../../dart-sdk/lib/_internal/js_runtime/lib/interceptors.dart" - - _foreign_helper: - uri: "../../../../dart-sdk/lib/_internal/js_runtime/lib/foreign_helper.dart" - - _js_names: - uri: "../../../../dart-sdk/lib/_internal/js_runtime/lib/js_names.dart" - - _js_primitives: - uri: "../../../../dart-sdk/lib/_internal/js_runtime/lib/js_primitives.dart" - - _js_embedded_names: - uri: "../../../../dart-sdk/lib/_internal/js_runtime/lib/shared/embedded_names.dart" - - _async_await_error_codes: - uri: "../../../../dart-sdk/lib/_internal/js_runtime/lib/shared/async_await_error_codes.dart" - - _metadata: - uri: "../../../../dart-sdk/lib/html/html_common/metadata.dart" \ No newline at end of file diff --git a/web_sdk/BUILD.gn b/web_sdk/BUILD.gn new file mode 100644 index 0000000000000..507afb3d6816f --- /dev/null +++ b/web_sdk/BUILD.gn @@ -0,0 +1,66 @@ +# Copyright 2019 The Flutter Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +group("web_sdk") { + sdk_copy_deps = [] + + deps = [ + ":web_ui_sources", + ":web_libraries_json", + ":dart_sdk_internal", + ] + sdk_copy_deps +} + +copy("web_ui_sources") { + sources = [ + "$flutter_root/lib/stub_ui/compositing.dart", + "$flutter_root/lib/stub_ui/geometry.dart", + "$flutter_root/lib/stub_ui/hash_codes.dart", + "$flutter_root/lib/stub_ui/hooks.dart", + "$flutter_root/lib/stub_ui/isolate_name_server.dart", + "$flutter_root/lib/stub_ui/lerp.dart", + "$flutter_root/lib/stub_ui/natives.dart", + "$flutter_root/lib/stub_ui/painting.dart", + "$flutter_root/lib/stub_ui/plugins.dart", + "$flutter_root/lib/stub_ui/pointer.dart", + "$flutter_root/lib/stub_ui/semantics.dart", + "$flutter_root/lib/stub_ui/text.dart", + "$flutter_root/lib/stub_ui/ui.dart", + "$flutter_root/lib/stub_ui/versions.dart", + "$flutter_root/lib/stub_ui/window.dart", + ] + + outputs = [ + "$root_out_dir/flutter_web_sdk/lib/ui/{{source_file_part}}" + ] +} + +copy("web_libraries_json") { + sources = [ + "libraries.json" + ] + + outputs = [ + "$root_out_dir/flutter_web_sdk/lib/libraries.json" + ] +} + +copy("dart_sdk_internal") { + deps = [ + "//third_party/dart:create_sdk" + ] + + sources = [ + "$root_out_dir/dart-sdk/lib/_internal/ddc_sdk.dill", + "$root_out_dir/dart-sdk/lib/_internal/dart2js_platform.dill", + "$root_out_dir/dart-sdk/lib/_internal/dart2js_server_platform.dill", + "$root_out_dir/dart-sdk/lib/_internal/ddc_sdk.sum", + "$root_out_dir/dart-sdk/lib/_internal/strong.sum", + "$root_out_dir/dart-sdk/lib/_internal/vm_platform_strong.dill", + ] + + outputs = [ + "$root_out_dir/flutter_web_sdk/lib/_internal/{{source_file_part}}" + ] +} diff --git a/web_sdk/libraries.json b/web_sdk/libraries.json new file mode 100644 index 0000000000000..a9203707e82f4 --- /dev/null +++ b/web_sdk/libraries.json @@ -0,0 +1,236 @@ +{ + "comment:0": "NOTE: THIS FILE IS GENERATED. DO NOT EDIT.", + "comment:1": "Instead modify 'flutter/flutter_web/libraries.yaml' and follow the instructions therein.", + "dart2js": { + "libraries": { + "async": { + "patches": "lib/_internal/js_runtime/lib/async_patch.dart", + "uri": "lib/async/async.dart" + }, + "_interceptors": { + "uri": "lib/_internal/js_runtime/lib/interceptors.dart" + }, + "mirrors": { + "patches": "lib/_internal/js_runtime/lib/mirrors_patch_cfe.dart", + "supported": false, + "uri": "lib/mirrors/mirrors.dart" + }, + "_js_embedded_names": { + "uri": "lib/_internal/js_runtime/lib/shared/embedded_names.dart" + }, + "io": { + "patches": "lib/_internal/js_runtime/lib/io_patch.dart", + "supported": false, + "uri": "lib/io/io.dart" + }, + "_internal": { + "patches": "lib/_internal/js_runtime/lib/internal_patch.dart", + "uri": "lib/internal/internal.dart" + }, + "_metadata": { + "uri": "lib/html/html_common/metadata.dart" + }, + "_async_await_error_codes": { + "uri": "lib/_internal/js_runtime/lib/shared/async_await_error_codes.dart" + }, + "_http": { + "uri": "lib/_http/http.dart" + }, + "_js_primitives": { + "uri": "lib/_internal/js_runtime/lib/js_primitives.dart" + }, + "_js_helper": { + "uri": "lib/_internal/js_runtime/lib/js_helper.dart" + }, + "_chrome": { + "uri": "lib/_chrome/dart2js/chrome_dart2js.dart" + }, + "html_common": { + "uri": "lib/html/html_common/html_common_dart2js.dart" + }, + "ui": { + "uri": "../lib/ui/ui.dart" + }, + "js": { + "uri": "lib/js/dart2js/js_dart2js.dart" + }, + "_native_typed_data": { + "uri": "lib/_internal/js_runtime/lib/native_typed_data.dart" + }, + "_js_names": { + "uri": "lib/_internal/js_runtime/lib/js_names.dart" + }, + "core": { + "patches": "lib/_internal/js_runtime/lib/core_patch.dart", + "uri": "lib/core/core.dart" + }, + "collection": { + "patches": "lib/_internal/js_runtime/lib/collection_patch.dart", + "uri": "lib/collection/collection.dart" + }, + "js_util": { + "uri": "lib/js_util/dart2js/js_util_dart2js.dart" + }, + "typed_data": { + "patches": "lib/_internal/js_runtime/lib/typed_data_patch.dart", + "uri": "lib/typed_data/typed_data.dart" + }, + "web_audio": { + "uri": "lib/web_audio/dart2js/web_audio_dart2js.dart" + }, + "html": { + "uri": "lib/html/dart2js/html_dart2js.dart" + }, + "isolate": { + "patches": "lib/_internal/js_runtime/lib/isolate_patch.dart", + "supported": false, + "uri": "lib/isolate/isolate.dart" + }, + "developer": { + "patches": "lib/_internal/js_runtime/lib/developer_patch.dart", + "uri": "lib/developer/developer.dart" + }, + "web_gl": { + "uri": "lib/web_gl/dart2js/web_gl_dart2js.dart" + }, + "indexed_db": { + "uri": "lib/indexed_db/dart2js/indexed_db_dart2js.dart" + }, + "_js": { + "patches": "lib/js/_js_client.dart", + "uri": "lib/js/_js.dart" + }, + "convert": { + "patches": "lib/_internal/js_runtime/lib/convert_patch.dart", + "uri": "lib/convert/convert.dart" + }, + "math": { + "patches": "lib/_internal/js_runtime/lib/math_patch.dart", + "uri": "lib/math/math.dart" + }, + "_foreign_helper": { + "uri": "lib/_internal/js_runtime/lib/foreign_helper.dart" + }, + "web_sql": { + "uri": "lib/web_sql/dart2js/web_sql_dart2js.dart" + }, + "svg": { + "uri": "lib/svg/dart2js/svg_dart2js.dart" + } + } + }, + "dartdevc": { + "libraries": { + "async": { + "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/async_patch.dart", + "uri": "lib/async/async.dart" + }, + "_runtime": { + "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/ddc_runtime/runtime.dart" + }, + "_interceptors": { + "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/interceptors.dart" + }, + "mirrors": { + "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/mirrors_patch.dart", + "supported": false, + "uri": "lib/mirrors/mirrors.dart" + }, + "_debugger": { + "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/debugger.dart" + }, + "io": { + "patches": "io_patch.dart", + "supported": false, + "uri": "lib/io/io.dart" + }, + "_internal": { + "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/internal_patch.dart", + "uri": "lib/internal/internal.dart" + }, + "_metadata": { + "uri": "lib/html/html_common/metadata.dart" + }, + "_http": { + "uri": "lib/_http/http.dart" + }, + "_js_primitives": { + "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/js_primitives.dart" + }, + "_js_helper": { + "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/js_helper.dart" + }, + "ui": { + "uri": "../lib/ui/ui.dart" + }, + "js": { + "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/lib/js/dart2js/js_dart2js.dart" + }, + "_js_mirrors": { + "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/js_mirrors.dart" + }, + "html_common": { + "uri": "lib/html/html_common/html_common_dart2js.dart" + }, + "_native_typed_data": { + "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/native_typed_data.dart" + }, + "core": { + "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/core_patch.dart", + "uri": "lib/core/core.dart" + }, + "js_util": { + "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/lib/js_util/dart2js/js_util_dart2js.dart" + }, + "collection": { + "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/collection_patch.dart", + "uri": "lib/collection/collection.dart" + }, + "typed_data": { + "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/typed_data_patch.dart", + "uri": "lib/typed_data/typed_data.dart" + }, + "web_audio": { + "uri": "lib/web_audio/dart2js/web_audio_dart2js.dart" + }, + "html": { + "uri": "lib/html/dart2js/html_dart2js.dart" + }, + "developer": { + "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/developer_patch.dart", + "uri": "lib/developer/developer.dart" + }, + "isolate": { + "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/isolate_patch.dart", + "supported": false, + "uri": "lib/isolate/isolate.dart" + }, + "web_gl": { + "uri": "lib/web_gl/dart2js/web_gl_dart2js.dart" + }, + "indexed_db": { + "uri": "lib/indexed_db/dart2js/indexed_db_dart2js.dart" + }, + "convert": { + "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/convert_patch.dart", + "uri": "lib/convert/convert.dart" + }, + "_isolate_helper": { + "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/isolate_helper.dart" + }, + "math": { + "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/math_patch.dart", + "uri": "lib/math/math.dart" + }, + "_foreign_helper": { + "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/foreign_helper.dart" + }, + "web_sql": { + "uri": "lib/web_sql/dart2js/web_sql_dart2js.dart" + }, + "svg": { + "uri": "lib/svg/dart2js/svg_dart2js.dart" + } + } + } +} \ No newline at end of file diff --git a/web_sdk/libraries.yaml b/web_sdk/libraries.yaml new file mode 100644 index 0000000000000..2516e18d4fdbf --- /dev/null +++ b/web_sdk/libraries.yaml @@ -0,0 +1,240 @@ +# Copyright (c) 2017, 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 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 +# https://github.com/dart-lang/sdk/issues/28836. + +dartdevc: + libraries: + _runtime: + uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/ddc_runtime/runtime.dart" + + _debugger: + uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/debugger.dart" + + _foreign_helper: + uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/foreign_helper.dart" + + _http: + uri: "lib/_http/http.dart" + + _interceptors: + uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/interceptors.dart" + + _internal: + uri: "lib/internal/internal.dart" + patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/internal_patch.dart" + + _isolate_helper: + uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/isolate_helper.dart" + + _js_helper: + uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/js_helper.dart" + + _js_mirrors: + uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/js_mirrors.dart" + + _js_primitives: + uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/js_primitives.dart" + + _metadata: + uri: "lib/html/html_common/metadata.dart" + + _native_typed_data: + uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/native_typed_data.dart" + + async: + uri: "lib/async/async.dart" + patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/async_patch.dart" + + collection: + uri: "lib/collection/collection.dart" + patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/collection_patch.dart" + + convert: + uri: "lib/convert/convert.dart" + patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/convert_patch.dart" + + core: + uri: "lib/core/core.dart" + patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/core_patch.dart" + + developer: + uri: "lib/developer/developer.dart" + patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/developer_patch.dart" + + io: + uri: "lib/io/io.dart" + patches: "io_patch.dart" + supported: false + + isolate: + uri: "lib/isolate/isolate.dart" + patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/isolate_patch.dart" + supported: false + + mirrors: + uri: "lib/mirrors/mirrors.dart" + patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/mirrors_patch.dart" + supported: false + + math: + uri: "lib/math/math.dart" + patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/math_patch.dart" + + typed_data: + uri: "lib/typed_data/typed_data.dart" + patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/typed_data_patch.dart" + + html: + uri: "lib/html/dart2js/html_dart2js.dart" + + html_common: + uri: "lib/html/html_common/html_common_dart2js.dart" + + indexed_db: + uri: "lib/indexed_db/dart2js/indexed_db_dart2js.dart" + + js: + uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/lib/js/dart2js/js_dart2js.dart" + + js_util: + uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/lib/js_util/dart2js/js_util_dart2js.dart" + + svg: + uri: "lib/svg/dart2js/svg_dart2js.dart" + + web_audio: + uri: "lib/web_audio/dart2js/web_audio_dart2js.dart" + + web_gl: + uri: "lib/web_gl/dart2js/web_gl_dart2js.dart" + + web_sql: + uri: "lib/web_sql/dart2js/web_sql_dart2js.dart" + + ui: + uri: "../lib/ui/ui.dart" + +dart2js: + libraries: + ui: + uri: "../lib/ui/ui.dart" + + async: + uri: "lib/async/async.dart" + patches: "lib/_internal/js_runtime/lib/async_patch.dart" + + _chrome: + uri: "lib/_chrome/dart2js/chrome_dart2js.dart" + + collection: + uri: "lib/collection/collection.dart" + patches: "lib/_internal/js_runtime/lib/collection_patch.dart" + + convert: + uri: "lib/convert/convert.dart" + patches: "lib/_internal/js_runtime/lib/convert_patch.dart" + + core: + uri: "lib/core/core.dart" + patches: "lib/_internal/js_runtime/lib/core_patch.dart" + + developer: + uri: "lib/developer/developer.dart" + patches: "lib/_internal/js_runtime/lib/developer_patch.dart" + + html: + uri: "lib/html/dart2js/html_dart2js.dart" + + html_common: + uri: "lib/html/html_common/html_common_dart2js.dart" + + indexed_db: + uri: "lib/indexed_db/dart2js/indexed_db_dart2js.dart" + + _http: + uri: "lib/_http/http.dart" + + io: + uri: "lib/io/io.dart" + patches: "io_patch.dart" + supported: false + + isolate: + uri: "lib/isolate/isolate.dart" + patches: "lib/_internal/js_runtime/lib/isolate_patch.dart" + supported: false + + js: + uri: "lib/js/dart2js/js_dart2js.dart" + + _js: + uri: "lib/js/_js.dart" + patches: "lib/js/_js_client.dart" + + js_util: + uri: "lib/js_util/dart2js/js_util_dart2js.dart" + + math: + uri: "lib/math/math.dart" + patches: "lib/_internal/js_runtime/lib/math_patch.dart" + + mirrors: + uri: "lib/mirrors/mirrors.dart" + patches: "lib/_internal/js_runtime/lib/mirrors_patch_cfe.dart" + supported: false + + typed_data: + uri: "lib/typed_data/typed_data.dart" + patches: "lib/_internal/js_runtime/lib/typed_data_patch.dart" + + _native_typed_data: + uri: "lib/_internal/js_runtime/lib/native_typed_data.dart" + + svg: + uri: "lib/svg/dart2js/svg_dart2js.dart" + + web_audio: + uri: "lib/web_audio/dart2js/web_audio_dart2js.dart" + + web_gl: + uri: "lib/web_gl/dart2js/web_gl_dart2js.dart" + + web_sql: + uri: "lib/web_sql/dart2js/web_sql_dart2js.dart" + + _internal: + uri: "lib/internal/internal.dart" + patches: "lib/_internal/js_runtime/lib/internal_patch.dart" + + _js_helper: + uri: "lib/_internal/js_runtime/lib/js_helper.dart" + + _interceptors: + uri: "lib/_internal/js_runtime/lib/interceptors.dart" + + _foreign_helper: + uri: "lib/_internal/js_runtime/lib/foreign_helper.dart" + + _js_names: + uri: "lib/_internal/js_runtime/lib/js_names.dart" + + _js_primitives: + uri: "lib/_internal/js_runtime/lib/js_primitives.dart" + + _js_embedded_names: + uri: "lib/_internal/js_runtime/lib/shared/embedded_names.dart" + + _async_await_error_codes: + uri: "lib/_internal/js_runtime/lib/shared/async_await_error_codes.dart" + + _metadata: + uri: "lib/html/html_common/metadata.dart" \ No newline at end of file diff --git a/web_sdk/make_combined_sdk.sh b/web_sdk/make_combined_sdk.sh new file mode 100755 index 0000000000000..06b673baba8a2 --- /dev/null +++ b/web_sdk/make_combined_sdk.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +# Reference script for creating patched sdk locally. +# Copy normal dart sources into flutter_patched sdk +mkdir -p out/host_debug_unopt/flutter_patched_sdk/lib +cp -RL out/host_debug_unopt/dart-sdk/lib/ out/host_debug_unopt/flutter_patched_sdk/lib + +# Copy stub ui dart sources into flutter_patched sdk +mkdir -p out/host_debug_unopt/flutter_patched_sdk/lib/ui +cp -RL flutter/lib/stub_ui/ out/host_debug_unopt/flutter_patched_sdk/lib/ui + +# Copy libraries.json into flutter patched sdk. +cp -RL flutter/flutter_web/libraries.json out/host_debug_unopt/flutter_patched_sdk/lib/libraries.json + +# Copy libraries.dart into flutter patched sdk +cp -RL flutter/flutter_web/libraries.dart out/host_debug_unopt/flutter_patched_sdk/lib/_internal/libraries.dart