Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Fix --no-prebuilt-dart-sdk build #46842

Closed
zanderso wants to merge 1 commit into from
+6 −10
Closed

Fix --no-prebuilt-dart-sdk build #46842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions build/dart/rules.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,7 @@ template("flutter_frontend_server") {

kernel_output = invoker.kernel_output

common_deps = [
"//flutter/flutter_frontend_server:frontend_server",
"//flutter/lib/snapshot:strong_platform",
]
common_deps = [ "//flutter/lib/snapshot:strong_platform" ]
if (defined(invoker.deps)) {
common_deps += invoker.deps
}
Expand Down Expand Up @@ -75,6 +72,7 @@ template("flutter_frontend_server") {
]

if (flutter_prebuilt_dart_sdk) {
common_deps += [ "//flutter/flutter_frontend_server:frontend_server" ]
action(target_name) {
forward_variables_from(invoker,
[
Expand All @@ -100,7 +98,7 @@ template("flutter_frontend_server") {
args = [ dart ] + common_vm_args + [ frontend_server ] + common_args
}
} else {
dart_action(target_name) {
prebuilt_dart_action(target_name) {
forward_variables_from(invoker,
[
"visibility",
Expand All @@ -109,8 +107,7 @@ template("flutter_frontend_server") {
[ "pool" ])
deps = common_deps
pool = "//flutter/build/dart:dart_pool"
script = "$root_gen_dir/frontend_server.dart.snapshot"
packages = rebase_path(invoker.package_config)
Copy link
Member Author

@zanderso zanderso Oct 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is redundant with the logic above in all cases.

script = "//third_party/dart/pkg/frontend_server/bin/frontend_server_starter.dart"
inputs = [ invoker.main_dart ]
outputs = [ invoker.kernel_output ]
depfile = snapshot_depfile
Expand Down
5 changes: 2 additions & 3 deletions flutter_frontend_server/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ copy("frontend_server") {
snapshot =
"$host_prebuilt_dart_sdk/bin/snapshots/frontend_server.dart.snapshot"
} else {
deps = [ "//flutter/build/dart:dart_sdk" ]
snapshot =
"$root_out_dir/dart-sdk/bin/snapshots/frontend_server.dart.snapshot"
deps = [ "//third_party/dart/utils/kernel-service:frontend_server" ]
snapshot = "$root_out_dir/frontend_server.dart.snapshot"
}

sources = [ snapshot ]
Expand Down