From 60a056f0b01515ad70ff99d08dd3d2b7475c6c37 Mon Sep 17 00:00:00 2001
From: Maksim Denisov <denisov.maksim@huawei.com>
Date: Tue, 11 Jun 2024 13:19:38 +0200
Subject: Pass ServeApi as a field of context to the analysis

...instead of using singleton calls.
---
 src/buildtool/build_engine/target_map/target_map.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/buildtool/build_engine/target_map/target_map.cpp')

diff --git a/src/buildtool/build_engine/target_map/target_map.cpp b/src/buildtool/build_engine/target_map/target_map.cpp
index 0170f3f5..8df7abbf 100644
--- a/src/buildtool/build_engine/target_map/target_map.cpp
+++ b/src/buildtool/build_engine/target_map/target_map.cpp
@@ -1905,7 +1905,7 @@ auto CreateTargetMap(
         else if (context->repo_config
                      ->TargetRoot(key.target.ToModule().repository)
                      ->IsAbsent()) {
-            if (not RemoteServeConfig::Instance().RemoteAddress()) {
+            if (not context->serve) {
                 (*logger)(
                     fmt::format("Root for target {} is absent, but no serve "
                                 "endpoint was configured. Please provide "
@@ -1914,7 +1914,7 @@ auto CreateTargetMap(
                     /*is_fatal=*/true);
                 return;
             }
-            if (not ServeApi::Instance().CheckServeRemoteExecution()) {
+            if (not(*context->serve)->CheckServeRemoteExecution()) {
                 (*logger)(
                     "Inconsistent remote execution endpoint and serve endpoint"
                     "configuration detected.",
-- 
cgit v1.2.3