Revert "Support dartdevc, dart2js with shared source files, dartdevc sdk (flutter#8105)"

This reverts commit 7d0e7a7.

Author: RBogie

BUILD.gn

@@ -4,12 +4,6 @@
 
 import("$flutter_root/common/config.gni")
 
-# Whether to build the dartdevc sdk, libraries, and source files
-# required for the flutter web sdk.
-declare_args() {
-  full_dart_sdk = false  
-}
-
 group("flutter") {
   testonly = true
 
@@ -29,13 +23,8 @@ group("flutter") {
       public_deps += [
         "$flutter_root/frontend_server",
         "//third_party/dart:create_sdk",
+        "$flutter_root/web_sdk",
       ]
-
-      if (full_dart_sdk) {
-        public_deps += [
-          "$flutter_root/web_sdk",
-        ]
-      }
     }
   }
 

ci/licenses_golden/licenses_flutter

@@ -704,7 +704,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
 ----------------------------------------------------------------------------------------------------
 Copyright 2013 The Flutter Authors. All rights reserved.

tools/gn

@@ -234,10 +234,8 @@ def to_gn_args(args):
     if args.arm_float_abi:
       gn_args['arm_float_abi'] = args.arm_float_abi
 
-    # Whether to build trained Dart SDK snapshots of dart2js and dartdevc,
-    # including the web sdk kernel and source files.
+    # Whether to build trained Dart SDK snapshots of dart2js and dartdevc.
     gn_args['dart_platform_sdk'] = not args.full_dart_sdk
-    gn_args['full_dart_sdk'] = args.full_dart_sdk
 
     return gn_args
 

web_sdk/BUILD.gn

@@ -2,82 +2,63 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-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 = "$flutter_root/web_sdk/libraries.json"
-
-web_ui_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",
-]
-
 group("web_sdk") {
   deps = [
     ":web_ui_sources",
-    ":web_ui_library",
-    ":flutter_dartdevc_kernel_sdk",
+    ":web_libraries_json",
+    #":dart_sdk_internal",
   ]
 }
 
 copy("web_ui_sources") {
-  sources = 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_ui_library") {
+copy("web_libraries_json") {
   sources = [
-    "$flutter_root/web_sdk/libraries.json",
+    "libraries.json"
   ]
 
   outputs = [
-    "$root_out_dir/flutter_web_sdk/{{source_file_part}}"
+    "$root_out_dir/flutter_web_sdk/lib/libraries.json"
   ]
 }
 
-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",
-  ]
+# copy("dart_sdk_internal") {
+#     deps = [
+#         "//third_party/dart:create_sdk"
+#     ]
 
-  inputs = [
-    "//third_party/dart/pkg/dev_compiler/tool/kernel_sdk.dart",
-  ]
+#     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 = [
-    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",
-  ]
-}
+#     outputs = [
+#         "$root_out_dir/flutter_web_sdk/lib/_internal/{{source_file_part}}"
+#     ]
+# }