diff options
Diffstat (limited to 'src/buildtool/execution_api/bazel_msg')
6 files changed, 13 insertions, 12 deletions
diff --git a/src/buildtool/execution_api/bazel_msg/TARGETS b/src/buildtool/execution_api/bazel_msg/TARGETS index 3adeaa9e..69cde0b5 100644 --- a/src/buildtool/execution_api/bazel_msg/TARGETS +++ b/src/buildtool/execution_api/bazel_msg/TARGETS @@ -4,9 +4,7 @@ , "hdrs": ["bazel_blob_container.hpp", "bazel_common.hpp"] , "deps": [ ["src/buildtool/common", "bazel_types"] - , ["src/buildtool/common", "common"] , ["src/buildtool/execution_api/common", "content_blob_container"] - , ["src/buildtool/file_system", "file_system_manager"] ] , "stage": ["src", "buildtool", "execution_api", "bazel_msg"] } @@ -23,7 +21,6 @@ , ["src/buildtool/common", "common"] , ["src/buildtool/crypto", "hash_function"] , ["src/buildtool/execution_api/common", "artifact_blob_container"] - , ["src/buildtool/execution_engine/dag", "dag"] , ["src/buildtool/file_system", "object_type"] , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] @@ -31,7 +28,9 @@ ] , "private-deps": [ ["@", "fmt", "", "fmt"] + , ["@", "protoc", "", "libprotobuf"] , ["src/buildtool/common", "artifact_digest_factory"] + , ["src/buildtool/execution_api/common", "content_blob_container"] , ["src/buildtool/file_system", "file_system_manager"] , ["src/buildtool/file_system", "git_repo"] , ["src/utils/cpp", "hex_string"] diff --git a/src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp b/src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp index 824c3084..039ddf9c 100644 --- a/src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp +++ b/src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp @@ -15,13 +15,8 @@ #ifndef INCLUDED_SRC_BUILDTOOL_EXECUTION_API_BAZEL_MSG_BAZEL_BLOB_CONTAINER_HPP #define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_BAZEL_MSG_BAZEL_BLOB_CONTAINER_HPP -#include <filesystem> -#include <optional> - -#include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/common/bazel_types.hpp" #include "src/buildtool/execution_api/common/content_blob_container.hpp" -#include "src/buildtool/file_system/file_system_manager.hpp" using BazelBlob = ContentBlob<bazel_re::Digest>; using BazelBlobContainer = ContentBlobContainer<bazel_re::Digest>; diff --git a/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp b/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp index 0d5aa8b0..be0e3309 100644 --- a/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp +++ b/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp @@ -15,18 +15,22 @@ #include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp" #include <algorithm> +#include <compare> #include <exception> #include <filesystem> #include <functional> #include <memory> #include <optional> -#include <sstream> #include <string> +#include <unordered_map> #include <utility> // std::move #include <vector> #include "fmt/core.h" +#include "google/protobuf/duration.pb.h" +#include "google/protobuf/repeated_ptr_field.h" #include "src/buildtool/common/artifact_digest_factory.hpp" +#include "src/buildtool/execution_api/common/content_blob_container.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/git_repo.hpp" #include "src/utils/cpp/hex_string.hpp" diff --git a/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp b/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp index 540aaa39..030dc0b1 100644 --- a/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp +++ b/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp @@ -18,10 +18,11 @@ #include <chrono> #include <filesystem> #include <functional> -#include <memory> +#include <iterator> +#include <map> #include <optional> #include <string> -#include <utility> +#include <variant> #include <vector> #include "gsl/gsl" @@ -32,7 +33,6 @@ #include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp" #include "src/buildtool/execution_api/bazel_msg/directory_tree.hpp" #include "src/buildtool/execution_api/common/artifact_blob_container.hpp" -#include "src/buildtool/execution_engine/dag/dag.hpp" #include "src/buildtool/file_system/object_type.hpp" #include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" diff --git a/src/buildtool/execution_api/bazel_msg/directory_tree.cpp b/src/buildtool/execution_api/bazel_msg/directory_tree.cpp index c7ddfdef..5f1c4e3d 100644 --- a/src/buildtool/execution_api/bazel_msg/directory_tree.cpp +++ b/src/buildtool/execution_api/bazel_msg/directory_tree.cpp @@ -14,6 +14,8 @@ #include "directory_tree.hpp" +#include <utility> + #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/logging/log_level.hpp" diff --git a/src/buildtool/execution_api/bazel_msg/directory_tree.hpp b/src/buildtool/execution_api/bazel_msg/directory_tree.hpp index 5436be9e..5b3aad60 100644 --- a/src/buildtool/execution_api/bazel_msg/directory_tree.hpp +++ b/src/buildtool/execution_api/bazel_msg/directory_tree.hpp @@ -16,6 +16,7 @@ #define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_BAZEL_MSG_DIRECTORY_TREE_HPP #include <filesystem> +#include <functional> #include <memory> #include <optional> #include <string> |