Remove flutter_kernel_sdk dart script (#10808)

Jonah Williams · web-flow · commit 1b287524eee7 · 2019-08-09T12:43:20.000-07:00
diff --git a/ci/licenses_golden/licenses_flutter b/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/web_sdk/BUILD.gn b/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,32 +96,88 @@ copy("web_ui_library") {
   ]
 }
 
-prebuilt_dart_action("flutter_dartdevc_kernel_sdk") {
+# 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 = [
-    "//third_party/dart/pkg/dev_compiler/tool/kernel_sdk.dart",
-  ]
+  inputs = []
 
   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"
+  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",
+    "//third_party/dart/utils/dartdevc:dartdevc_files_stamp",
+    "//third_party/dart/utils/dartdevc:dartdevc_sdk_patch_stamp",
+  ]
+
+  inputs = []
+
   packages = "//third_party/dart/.packages"
 
-  output_path = rebase_path(sdk_dill)
-  libraries_path = rebase_path(sdk_libraries_json)
+  script = "//third_party/dart/pkg/dev_compiler/bin/dartdevc.dart"
+
+  outputs = [
+    "$root_out_dir/flutter_web_sdk/kernel/amd/dart_sdk.js",
+    "$root_out_dir/flutter_web_sdk/kernel/amd/dart_sdk.js.map",
+  ]
 
   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/web_sdk/flutter_kernel_sdk.dart b/web_sdk/flutter_kernel_sdk.dart
