diff --git a/engine/src/flutter/ci/licenses_golden/licenses_flutter b/engine/src/flutter/ci/licenses_golden/licenses_flutter index e0ada13dee..c3ae3d9fdd 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_flutter +++ b/engine/src/flutter/ci/licenses_golden/licenses_flutter @@ -1015,7 +1015,6 @@ 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/flutter_kernel_sdk.dart FILE: ../../../flutter/web_sdk/libraries.json FILE: ../../../flutter/web_sdk/sdk_rewriter.dart ---------------------------------------------------------------------------------------------------- diff --git a/engine/src/flutter/web_sdk/BUILD.gn b/engine/src/flutter/web_sdk/BUILD.gn index 588594204d..675f1246e8 100644 --- a/engine/src/flutter/web_sdk/BUILD.gn +++ b/engine/src/flutter/web_sdk/BUILD.gn @@ -5,8 +5,8 @@ import("//third_party/dart/build/dart/dart_action.gni") import("//third_party/dart/utils/compile_platform.gni") -sdk_dill = "$root_out_dir/flutter_web_sdk/kernel/flutter_ddc_sdk.dill" sdk_libraries_json = "$root_out_dir/flutter_web_sdk/libraries.json" +sdk_dill = "$root_out_dir/flutter_web_sdk/kernel/flutter_ddc_sdk.dill" web_ui_sources = exec_script("//third_party/dart/tools/list_dart_files.py", @@ -31,6 +31,7 @@ web_engine_sources += [ "$flutter_root/lib/web_ui/lib/src/engine.dart" ] group("web_sdk") { deps = [ ":flutter_dartdevc_kernel_sdk", + ":flutter_dartdevc_kernel_sdk_outline", ":web_engine_sources", ":web_ui_library", ":web_ui_sources", @@ -95,6 +96,48 @@ copy("web_ui_library") { ] } +# Compile the DDC SDK's summary. +prebuilt_dart_action("flutter_dartdevc_kernel_sdk_outline") { + deps = [ + "//third_party/dart/pkg:pkg_files_stamp", + "//third_party/dart/utils/dartdevc:dartdevc_files_stamp", + "//third_party/dart/utils/dartdevc:dartdevc_sdk_patch_stamp", + ] + + inputs = [] + + outputs = [ + sdk_dill, + ] + + script = "//third_party/dart/utils/bazel/kernel_worker.dart" + + args = [ + "--summary-only", + "--target", + "ddc", + "--packages-file", + "org-dartlang-sdk:/third_party/dart/.packages", + "--multi-root-scheme", + "org-dartlang-sdk", + "--multi-root", + "file://" + rebase_path("../../"), + "--libraries-file", + "org-dartlang-sdk:/$sdk_libraries_json", + "--output", + rebase_path(sdk_dill), + "--source", + "dart:core", + + # Additional Flutter web dart libraries + "--source", + "dart:ui", + "--source", + "dart:_engine", + ] +} + +# Compiles the DDC SDK's JS code. prebuilt_dart_action("flutter_dartdevc_kernel_sdk") { deps = [ "//third_party/dart/pkg:pkg_files_stamp", @@ -102,25 +145,39 @@ prebuilt_dart_action("flutter_dartdevc_kernel_sdk") { "//third_party/dart/utils/dartdevc:dartdevc_sdk_patch_stamp", ] - inputs = [ - "//third_party/dart/pkg/dev_compiler/tool/kernel_sdk.dart", - ] + inputs = [] + + packages = "//third_party/dart/.packages" + + script = "//third_party/dart/pkg/dev_compiler/bin/dartdevc.dart" outputs = [ - sdk_dill, - "$root_out_dir/flutter_web_sdk/lib/_internal/libraries.json", "$root_out_dir/flutter_web_sdk/kernel/amd/dart_sdk.js", "$root_out_dir/flutter_web_sdk/kernel/amd/dart_sdk.js.map", ] - script = "flutter_kernel_sdk.dart" - packages = "//third_party/dart/.packages" - - output_path = rebase_path(sdk_dill) - libraries_path = rebase_path(sdk_libraries_json) - args = [ - "--output=$output_path", - "--libraries=$libraries_path", + "-k", + "--compile-sdk", + "dart:core", + + # Additional Flutter web dart libraries + "dart:ui", + "dart:_engine", + "--no-summarize", + "--packages", + "org-dartlang-sdk:/third_party/dart/.packages", + "--multi-root-scheme", + "org-dartlang-sdk", + "--multi-root", + "file://" + rebase_path("../../"), + "--multi-root-output-path", + rebase_path("$root_out_dir/"), + "--libraries-file", + "org-dartlang-sdk:/$sdk_libraries_json", + "--modules", + "amd", + "-o", + rebase_path("$root_out_dir/flutter_web_sdk/kernel/amd/dart_sdk.js"), ] } diff --git a/engine/src/flutter/web_sdk/flutter_kernel_sdk.dart b/engine/src/flutter/web_sdk/flutter_kernel_sdk.dart deleted file mode 100644 index 2f5f3493f4..0000000000 --- a/engine/src/flutter/web_sdk/flutter_kernel_sdk.dart +++ /dev/null @@ -1,133 +0,0 @@ -// Copyright 2013 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. - -// These packages exist in the third_party/dart .package, but not locally -// which confuses the analyzer. -// ignore_for_file: uri_does_not_exist -import 'dart:async'; -import 'dart:convert' show json; -import 'dart:io'; -import 'package:args/args.dart' show ArgParser; -import 'package:dev_compiler/src/compiler/module_builder.dart'; -import 'package:dev_compiler/src/compiler/shared_command.dart' - show SharedCompilerOptions; -import 'package:dev_compiler/src/kernel/target.dart'; -import 'package:dev_compiler/src/kernel/command.dart'; -import 'package:dev_compiler/src/kernel/compiler.dart'; -import 'package:front_end/src/api_unstable/ddc.dart' - show - CompilerOptions, - kernelForComponent, - DiagnosticMessage, - printDiagnosticMessage, - Severity; -import 'package:kernel/kernel.dart'; -import 'package:kernel/target/targets.dart'; -import 'package:path/path.dart' as path; - -// This script is forked from https://github.com/dart-lang/sdk/blob/master/pkg/dev_compiler/tool/kernel_sdk.dart -// and produces the precompiled sdk for dartdevc. This has been modified to include a dart:ui target. -Future main(List args) async { - var ddcPath = path.dirname(path.dirname(path.fromUri(Platform.script))); - - // Parse flags. - var parser = ArgParser() - ..addOption('output') - ..addOption('libraries', - defaultsTo: path.join(ddcPath, '../../sdk/lib/libraries.json')); - var parserOptions = parser.parse(args); - var outputPath = parserOptions['output'] as String; - if (outputPath == null) { - var sdkRoot = path.absolute(path.dirname(path.dirname(ddcPath))); - var buildDir = path.join(sdkRoot, Platform.isMacOS ? 'xcodebuild' : 'out'); - var genDir = path.join(buildDir, 'ReleaseX64', 'gen', 'utils', 'dartdevc'); - outputPath = path.join(genDir, 'kernel', 'ddc_sdk.dill'); - } - - var librarySpecPath = parserOptions['libraries'] as String; - var packagesPath = path.join(ddcPath, '../third_party/dart/.packages'); - void onDiagnostic(DiagnosticMessage message) { - printDiagnosticMessage(message, print); - if (message.severity == Severity.error || - message.severity == Severity.internalProblem) { - exitCode = 1; - } - } - - var target = FlutterDevCompilerTarget(); - var options = CompilerOptions() - ..compileSdk = true - // TODO(sigmund): remove this unnecessary option when possible. - ..sdkRoot = Uri.base - ..packagesFileUri = Uri.base.resolveUri(Uri.file(packagesPath)) - ..librariesSpecificationUri = Uri.base.resolveUri(Uri.file(librarySpecPath)) - ..target = target - ..onDiagnostic = onDiagnostic - ..environmentDefines = {}; - - var inputs = target.extraRequiredLibraries.map(Uri.parse).toList(); - var component = await kernelForComponent(inputs, options); - - var outputDir = path.dirname(outputPath); - await Directory(outputDir).create(recursive: true); - await writeComponentToBinary(component, outputPath); - - var jsModule = ProgramCompiler( - component, - target.hierarchy, - SharedCompilerOptions(moduleName: 'dart_sdk'), - {}).emitModule(component, [], [], {}); - var moduleFormats = { - 'amd': ModuleFormat.amd, - }; - - for (var name in moduleFormats.keys) { - var format = moduleFormats[name]; - var jsDir = path.join(outputDir, name); - var jsPath = path.join(jsDir, 'dart_sdk.js'); - await Directory(jsDir).create(); - var jsCode = jsProgramToCode(jsModule, format); - await File(jsPath).writeAsString(jsCode.code); - await File('$jsPath.map').writeAsString(json.encode(jsCode.sourceMap)); - } -} - -class FlutterDevCompilerTarget extends DevCompilerTarget { - FlutterDevCompilerTarget() : super(TargetFlags()); - - @override - List get extraRequiredLibraries => const [ - 'dart:_runtime', - 'dart:_debugger', - 'dart:_foreign_helper', - 'dart:_interceptors', - 'dart:_internal', - 'dart:_isolate_helper', - 'dart:_js_helper', - 'dart:_js_mirrors', - 'dart:_js_primitives', - 'dart:_metadata', - 'dart:_native_typed_data', - 'dart:async', - 'dart:collection', - 'dart:convert', - 'dart:developer', - 'dart:io', - 'dart:isolate', - 'dart:js', - 'dart:js_util', - 'dart:math', - 'dart:mirrors', - 'dart:typed_data', - 'dart:indexed_db', - 'dart:html', - 'dart:html_common', - 'dart:svg', - 'dart:web_audio', - 'dart:web_gl', - 'dart:web_sql', - 'dart:ui', - 'dart:_engine', - ]; -}