From bfd2fa3e8d2ce3b7c14a63c01b2937e81ac8a581 Mon Sep 17 00:00:00 2001 From: Alexander Aprelev Date: Tue, 1 Oct 2024 08:33:53 -0700 Subject: [PATCH] Fix gen_dartcli_call in --no-prebuilt-dart-sdk. (flutter/engine#55558) Follow-up to https://github.com/flutter/engine/pull/55475 Test: `flutter/tools/gn --no-prebuilt-dart-sdk --unoptimized --runtime-mode debug && ninja -C out/host_debug_unopt` --- .../src/flutter/build/dart/internal/gen_dartcli_call.gni | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/engine/src/flutter/build/dart/internal/gen_dartcli_call.gni b/engine/src/flutter/build/dart/internal/gen_dartcli_call.gni index f7ae2ad40d..f9acbab35a 100644 --- a/engine/src/flutter/build/dart/internal/gen_dartcli_call.gni +++ b/engine/src/flutter/build/dart/internal/gen_dartcli_call.gni @@ -2,6 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//flutter/build/dart/dart.gni") import("//flutter/build/dart/internal/gen_executable_call.gni") import("//flutter/common/config.gni") @@ -24,7 +25,11 @@ template("gen_dartcli_call") { if (is_win) { ext = ".exe" } - dart = rebase_path("$host_prebuilt_dart_sdk/bin/dart$ext") + if (flutter_prebuilt_dart_sdk) { + dart = rebase_path("$host_prebuilt_dart_sdk/bin/dart$ext") + } else { + dart = rebase_path("$root_out_dir/dart-sdk/bin/dart$ext") + } # Add default arguments to the Dart CLI. dart_args = []