From e778886f4432c395870f26d85481408bf3291ec2 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Thu, 26 Sep 2024 11:32:16 -0700 Subject: [PATCH] Remove and inline dependencies on `build_root` for a constant. (flutter/engine#55441) Removes imports unused after https://github.com/flutter/engine/pull/55404, inlines a constant unused elsewhere. --- .../flutter/build/dart/internal/application_snapshot.gni | 1 - engine/src/flutter/build/dart/rules.gni | 8 -------- engine/src/flutter/sky/packages/sky_engine/BUILD.gn | 3 +++ 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/engine/src/flutter/build/dart/internal/application_snapshot.gni b/engine/src/flutter/build/dart/internal/application_snapshot.gni index 943fa11219..589733b987 100644 --- a/engine/src/flutter/build/dart/internal/application_snapshot.gni +++ b/engine/src/flutter/build/dart/internal/application_snapshot.gni @@ -3,7 +3,6 @@ # found in the LICENSE file. import("//build/compiled_action.gni") -import("//build/module_args/dart.gni") import("//flutter/build/dart/dart.gni") import("//flutter/common/config.gni") diff --git a/engine/src/flutter/build/dart/rules.gni b/engine/src/flutter/build/dart/rules.gni index 750fc762bd..2634efb0f4 100644 --- a/engine/src/flutter/build/dart/rules.gni +++ b/engine/src/flutter/build/dart/rules.gni @@ -4,14 +4,6 @@ # This file has rules for making Dart packages and snapshots. -import("//build/compiled_action.gni") -import("//build/module_args/dart.gni") -import("//flutter/build/dart/dart.gni") -import("//flutter/common/config.gni") - -import("$dart_src/build/dart/dart_action.gni") -import("$dart_src/sdk_args.gni") - import("//flutter/build/dart/internal/application_snapshot.gni") import("//flutter/build/dart/internal/flutter_frontend_server.gni") import("//flutter/build/dart/internal/flutter_snapshot.gni") diff --git a/engine/src/flutter/sky/packages/sky_engine/BUILD.gn b/engine/src/flutter/sky/packages/sky_engine/BUILD.gn index 1641dfff9a..097d9bc4ae 100644 --- a/engine/src/flutter/sky/packages/sky_engine/BUILD.gn +++ b/engine/src/flutter/sky/packages/sky_engine/BUILD.gn @@ -41,6 +41,9 @@ if (is_fuchsia) { dart_sdk_lib_path = rebase_path("$dart_src/sdk/lib") +# This variable should point to the Dart SDK. +dart_sdk_root = "//third_party/dart-sdk/dart-sdk" + copy("async") { lib_path = rebase_path("async", "", dart_sdk_lib_path) sources = rebase_path(async_sdk_sources, "", lib_path)