Use RemoteExecutionConfig instances stored in ApiBundle

...wherever an ApiBundle is already being passed.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/buildtool/serve_api/remote/target_client.cpp b/src/buildtool/serve_api/remote/target_client.cpp
index fd886254..d36b518e 100644
--- a/src/buildtool/serve_api/remote/target_client.cpp
+++ b/src/buildtool/serve_api/remote/target_client.cpp
@@ -60,7 +60,7 @@ auto TargetClient::ServeTarget(const TargetCacheKey& key,
     request.mutable_target_cache_key_id()->CopyFrom(key_dgst);
 
     // add execution properties to request
-    for (auto const& [k, v] : RemoteExecutionConfig::PlatformProperties()) {
+    for (auto const& [k, v] : apis_.remote_config.PlatformProperties()) {
         auto* prop = request.add_execution_properties();
         prop->set_name(k);
         prop->set_value(v);
@@ -71,7 +71,7 @@ auto TargetClient::ServeTarget(const TargetCacheKey& key,
     auto dispatch_list = nlohmann::json::array();
     try {
         for (auto const& [props, endpoint] :
-             RemoteExecutionConfig::DispatchList()) {
+             apis_.remote_config.DispatchList()) {
             auto entry = nlohmann::json::array();
             entry.push_back(nlohmann::json(props));
             entry.push_back(endpoint.ToJson());