From 661d0bdb668c1cddf5d5da9e48ece0b44c4e3962 Mon Sep 17 00:00:00 2001
From: Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com>
Date: Fri, 5 Jul 2024 17:52:53 +0200
Subject: Pass LocalExecutionConfig to ApiBundle

---
 src/buildtool/execution_api/common/api_bundle.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/buildtool/execution_api/common/api_bundle.cpp')

diff --git a/src/buildtool/execution_api/common/api_bundle.cpp b/src/buildtool/execution_api/common/api_bundle.cpp
index 411fb02f..0c763493 100644
--- a/src/buildtool/execution_api/common/api_bundle.cpp
+++ b/src/buildtool/execution_api/common/api_bundle.cpp
@@ -15,18 +15,19 @@
 #include "src/buildtool/execution_api/common/api_bundle.hpp"
 
 #include "src/buildtool/execution_api/bazel_msg/bazel_common.hpp"
-#include "src/buildtool/execution_api/local/config.hpp"
 #include "src/buildtool/execution_api/local/local_api.hpp"
 #include "src/buildtool/execution_api/remote/bazel/bazel_api.hpp"
 
-ApiBundle::ApiBundle(gsl::not_null<StorageConfig const*> const& storage_config,
-                     gsl::not_null<Storage const*> const& storage,
-                     RepositoryConfig const* repo_config,
-                     gsl::not_null<Auth const*> const& authentication,
-                     std::optional<ServerAddress> const& remote_address)
+ApiBundle::ApiBundle(
+    gsl::not_null<StorageConfig const*> const& storage_config,
+    gsl::not_null<Storage const*> const& storage,
+    gsl::not_null<LocalExecutionConfig const*> const& local_exec_config,
+    RepositoryConfig const* repo_config,
+    gsl::not_null<Auth const*> const& authentication,
+    std::optional<ServerAddress> const& remote_address)
     : local{std::make_shared<LocalApi>(storage_config,
                                        storage,
-                                       &LocalExecutionConfig::Instance(),
+                                       local_exec_config,
                                        repo_config)},  // needed by remote
       auth{*authentication},                           // needed by remote
       remote{CreateRemote(remote_address)} {}
-- 
cgit v1.2.3