Use ServeApi during bootstrap

...with a default implementation.

Although it is not used directly, it will be needed for instantiation of std::optional.

8 files changed, 34 insertions, 0 deletions

diff --git a/src/buildtool/serve_api/remote/configuration_client.cpp b/src/buildtool/serve_api/remote/configuration_client.cpp
index 6e6a5378..7f7bb535 100644
--- a/src/buildtool/serve_api/remote/configuration_client.cpp
+++ b/src/buildtool/serve_api/remote/configuration_client.cpp
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#ifndef BOOTSTRAP_BUILD_TOOL
+
 #include "src/buildtool/serve_api/remote/configuration_client.hpp"
 
 #include <exception>
@@ -113,3 +115,5 @@ auto ConfigurationClient::IsCompatible() const noexcept -> std::optional<bool> {
     }
     return response.compatible();
 }
+
+#endif  // BOOTSTRAP_BUILD_TOOL
diff --git a/src/buildtool/serve_api/remote/serve_api.hpp b/src/buildtool/serve_api/remote/serve_api.hpp
index a97b0bed..60de4d91 100644
--- a/src/buildtool/serve_api/remote/serve_api.hpp
+++ b/src/buildtool/serve_api/remote/serve_api.hpp
@@ -15,6 +15,10 @@
 #ifndef INCLUDED_SRC_BUILDTOOL_SERVE_API_REMOTE_SERVE_API_HPP
 #define INCLUDED_SRC_BUILDTOOL_SERVE_API_REMOTE_SERVE_API_HPP
 
+#ifdef BOOTSTRAP_BUILD_TOOL
+class ServeApi final {};
+#else
+
 #include <memory>
 #include <optional>
 #include <string>
@@ -141,4 +145,6 @@ class ServeApi final {
     ConfigurationClient const cc_;
 };
 
+#endif  // BOOTSTRAP_BUILD_TOOL
+
 #endif  // INCLUDED_SRC_BUILDTOOL_SERVE_API_REMOTE_SERVE_API_HPP
diff --git a/src/buildtool/serve_api/remote/source_tree_client.cpp b/src/buildtool/serve_api/remote/source_tree_client.cpp
index 2d011cab..7a51dd44 100644
--- a/src/buildtool/serve_api/remote/source_tree_client.cpp
+++ b/src/buildtool/serve_api/remote/source_tree_client.cpp
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#ifndef BOOTSTRAP_BUILD_TOOL
+
 #include "src/buildtool/serve_api/remote/source_tree_client.hpp"
 
 #include "src/buildtool/common/remote/client_common.hpp"
@@ -285,3 +287,5 @@ auto SourceTreeClient::GetRemoteTree(std::string const& tree_id) const noexcept
     // success!
     return true;
 }
+
+#endif  // BOOTSTRAP_BUILD_TOOL
diff --git a/src/buildtool/serve_api/remote/target_client.cpp b/src/buildtool/serve_api/remote/target_client.cpp
index 97bb53c1..292d3378 100644
--- a/src/buildtool/serve_api/remote/target_client.cpp
+++ b/src/buildtool/serve_api/remote/target_client.cpp
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#ifndef BOOTSTRAP_BUILD_TOOL
+
 #include "src/buildtool/serve_api/remote/target_client.hpp"
 
 #include <exception>
@@ -217,3 +219,5 @@ auto TargetClient::ServeTargetDescription(
     }
     return ArtifactDigest{response.description_id()};
 }
+
+#endif  // BOOTSTRAP_BUILD_TOOL
diff --git a/src/buildtool/serve_api/serve_service/configuration.cpp b/src/buildtool/serve_api/serve_service/configuration.cpp
index af939eee..4a38cc83 100644
--- a/src/buildtool/serve_api/serve_service/configuration.cpp
+++ b/src/buildtool/serve_api/serve_service/configuration.cpp
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#ifndef BOOTSTRAP_BUILD_TOOL
+
 #include "src/buildtool/serve_api/serve_service/configuration.hpp"
 
 #include <optional>
@@ -37,3 +39,5 @@ auto ConfigurationService::Compatibility(
     response->set_compatible(Compatibility::IsCompatible());
     return ::grpc::Status::OK;
 }
+
+#endif  // BOOTSTRAP_BUILD_TOOL
diff --git a/src/buildtool/serve_api/serve_service/serve_server_implementation.cpp b/src/buildtool/serve_api/serve_service/serve_server_implementation.cpp
index 59470966..e8412cad 100644
--- a/src/buildtool/serve_api/serve_service/serve_server_implementation.cpp
+++ b/src/buildtool/serve_api/serve_service/serve_server_implementation.cpp
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#ifndef BOOTSTRAP_BUILD_TOOL
+
 #include "src/buildtool/serve_api/serve_service/serve_server_implementation.hpp"
 
 #include <iostream>
@@ -175,3 +177,5 @@ auto ServeServerImpl::Run(bool with_execute) -> bool {
     Instance().port_ = static_cast<int>(*port_num);
     return true;
 }
+
+#endif  // BOOTSTRAP_BUILD_TOOL
diff --git a/src/buildtool/serve_api/serve_service/source_tree.cpp b/src/buildtool/serve_api/serve_service/source_tree.cpp
index 493dd0eb..9544a407 100644
--- a/src/buildtool/serve_api/serve_service/source_tree.cpp
+++ b/src/buildtool/serve_api/serve_service/source_tree.cpp
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#ifndef BOOTSTRAP_BUILD_TOOL
+
 #include "src/buildtool/serve_api/serve_service/source_tree.hpp"
 
 #include <algorithm>
@@ -1684,3 +1686,5 @@ auto SourceTreeService::GetRemoteTree(
     response->set_status(GetRemoteTreeResponse::OK);
     return ::grpc::Status::OK;
 }
+
+#endif  // BOOTSTRAP_BUILD_TOOL
diff --git a/src/buildtool/serve_api/serve_service/target.cpp b/src/buildtool/serve_api/serve_service/target.cpp
index dbcae8aa..5f6f038f 100644
--- a/src/buildtool/serve_api/serve_service/target.cpp
+++ b/src/buildtool/serve_api/serve_service/target.cpp
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#ifndef BOOTSTRAP_BUILD_TOOL
+
 #include "src/buildtool/serve_api/serve_service/target.hpp"
 
 #include "fmt/core.h"
@@ -915,3 +917,5 @@ auto TargetService::ServeTargetDescription(
     logger_->Emit(LogLevel::Error, error_msg);
     return ::grpc::Status{::grpc::StatusCode::INTERNAL, error_msg};
 }
+
+#endif  // BOOTSTRAP_BUILD_TOOL