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

[dart_aot_runner] Use the host_toolchain to build kernels #13096

Merged
iskakaushik merged 1 commit into from
Oct 11, 2019
Merged

[dart_aot_runner] Use the host_toolchain to build kernels #13096

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
5 changes: 3 additions & 2 deletions shell/platform/fuchsia/dart_runner/embedder/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ template("dart_shim_kernel") {
main_dart = rebase_path(invoker.main_dart)

deps = [
"../kernel:kernel_platform_files($host_toolchain)",
"../kernel:kernel_platform_files",
Copy link
Contributor Author

@iskakaushik iskakaushik Oct 11, 2019

Choose a reason for hiding this comment

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

@chinmaygarde , @jason-simmons maybe you guys know this, but when i specify the ($host_toolchain) here gn is unable to resolve the dependency of the input platform_dill between this and the kernel_platform_files target.

My theory is that maybe data deps can only exist between targets of same toolchain.

Copy link
Contributor Author

@iskakaushik iskakaushik Oct 11, 2019

Choose a reason for hiding this comment

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

I was able to look into prebuilt_dart_action and it seems to be relying on the host_toolchain by default and the redundant dependency here seems to be causing the problem. This PR should be good.

]

gen_kernel_script = "//third_party/dart/pkg/vm/bin/gen_kernel.dart"
Expand All @@ -23,6 +23,7 @@ template("dart_shim_kernel") {
dot_packages = rebase_path("//third_party/dart/.packages")

inputs = [
platform_dill,
gen_kernel_script,
main_dart,
dot_packages,
Expand Down Expand Up @@ -108,7 +109,7 @@ template("create_aot_snapshot") {
snapshot_assembly = "$target_gen_dir/aot${product_suffix}_vm_snapshot.S"

# gen_snapshot only needs this to go through the motions of setting up an isolate.
shim_target = ":shim${product_suffix}_kernel"
shim_target = ":shim${product_suffix}_kernel($host_toolchain)"
shim_kernel = get_label_info(shim_target, "target_gen_dir") +
"/shim${product_suffix}_kernel.dill"

Expand Down