From 4913c2be8e804b46c6eddb0c74304a7cdd595124 Mon Sep 17 00:00:00 2001 From: jonahwilliams Date: Thu, 12 Mar 2020 11:13:12 -0700 Subject: [PATCH 1/2] build a precompiled framework with canvaskit enabled --- web_sdk/BUILD.gn | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/web_sdk/BUILD.gn b/web_sdk/BUILD.gn index dbf416c1813d9..92787da8ef038 100644 --- a/web_sdk/BUILD.gn +++ b/web_sdk/BUILD.gn @@ -30,6 +30,7 @@ group("web_sdk") { deps = [ ":flutter_dartdevc_kernel_sdk", ":flutter_dartdevc_kernel_sdk_outline", + ":flutter_dartdevc_canvaskit_kernel_sdk", ":web_engine_sources", ":web_ui_library", ":web_ui_sources", @@ -186,3 +187,55 @@ prebuilt_dart_action("flutter_dartdevc_kernel_sdk") { rebase_path("$root_out_dir/flutter_web_sdk/kernel/legacy/dart_sdk.js"), ] } + +# Compiles the DDC CanvasKit SDK's JS code. +prebuilt_dart_action("flutter_dartdevc_canvaskit_kernel_sdk") { + deps = [ + "//third_party/dart:create_sdk", + "//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 = [ "sdk_rewriter.dart" ] + web_ui_sources + web_engine_sources + + packages = "//third_party/dart/.packages" + + script = "//third_party/dart/pkg/dev_compiler/bin/dartdevc.dart" + + outputs = [ + "$root_out_dir/flutter_web_sdk/kernel/amd-canvaskit/dart_sdk.js", + "$root_out_dir/flutter_web_sdk/kernel/amd-canvaskit/dart_sdk.js.map", + ] + + args = [ + "-k", + "--compile-sdk", + "dart:core", + + # Additional Flutter web dart libraries + "dart:ui", + "dart:_engine", + "--no-summarize", + "--packages", + "file:///" + rebase_path("//third_party/dart/.packages"), + "--multi-root-scheme", + "org-dartlang-sdk", + "--multi-root", + "file:///" + rebase_path("$root_out_dir"), + "--multi-root-output-path", + rebase_path("$root_out_dir/"), + "--libraries-file", + "org-dartlang-sdk:///flutter_web_sdk/libraries.json", + "--inline-source-map", + "-DFLUTTER_WEB_USE_SKIA=true", + "--modules", + "amd", + "-o", + rebase_path("$root_out_dir/flutter_web_sdk/kernel/amd-canvaskit/dart_sdk.js"), + "--modules", + "legacy", + "-o", + rebase_path("$root_out_dir/flutter_web_sdk/kernel/legacy-canvaskit/dart_sdk.js"), + ] +} From 1500b508a015be3767ee04d5689dce93bd137ffc Mon Sep 17 00:00:00 2001 From: jonahwilliams Date: Thu, 12 Mar 2020 11:37:56 -0700 Subject: [PATCH 2/2] format file --- web_sdk/BUILD.gn | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/web_sdk/BUILD.gn b/web_sdk/BUILD.gn index 92787da8ef038..7ddb146b12079 100644 --- a/web_sdk/BUILD.gn +++ b/web_sdk/BUILD.gn @@ -28,9 +28,9 @@ web_engine_sources += [ "//flutter/lib/web_ui/lib/src/engine.dart" ] group("web_sdk") { deps = [ + ":flutter_dartdevc_canvaskit_kernel_sdk", ":flutter_dartdevc_kernel_sdk", ":flutter_dartdevc_kernel_sdk_outline", - ":flutter_dartdevc_canvaskit_kernel_sdk", ":web_engine_sources", ":web_ui_library", ":web_ui_sources", @@ -232,10 +232,12 @@ prebuilt_dart_action("flutter_dartdevc_canvaskit_kernel_sdk") { "--modules", "amd", "-o", - rebase_path("$root_out_dir/flutter_web_sdk/kernel/amd-canvaskit/dart_sdk.js"), + rebase_path( + "$root_out_dir/flutter_web_sdk/kernel/amd-canvaskit/dart_sdk.js"), "--modules", "legacy", "-o", - rebase_path("$root_out_dir/flutter_web_sdk/kernel/legacy-canvaskit/dart_sdk.js"), + rebase_path( + "$root_out_dir/flutter_web_sdk/kernel/legacy-canvaskit/dart_sdk.js"), ] }