Move artifact_blob_container to a standalone library

6 files changed, 16 insertions, 3 deletions

diff --git a/src/buildtool/execution_api/common/TARGETS b/src/buildtool/execution_api/common/TARGETS
index 57394424..9e55c71c 100644
--- a/src/buildtool/execution_api/common/TARGETS
+++ b/src/buildtool/execution_api/common/TARGETS
@@ -9,11 +9,10 @@
     , "tree_reader.hpp"
     , "tree_reader_utils.hpp"
     , "stream_dumper.hpp"
-    , "artifact_blob_container.hpp"
     ]
   , "srcs": ["tree_reader_utils.cpp"]
   , "deps":
-    [ "content_blob_container"
+    [ "artifact_blob_container"
     , ["@", "gsl", "", "gsl"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/crypto", "hash_function"]
@@ -87,6 +86,7 @@
   , "srcs": ["blob_tree.cpp"]
   , "deps":
     [ "common"
+    , "artifact_blob_container"
     , ["src/buildtool/execution_api/bazel_msg", "directory_tree"]
     , ["@", "gsl", "", "gsl"]
     ]
@@ -101,7 +101,14 @@
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["content_blob_container"]
   , "hdrs": ["content_blob_container.hpp"]
-  , "stage": ["src", "buildtool", "execution_api", "common"]
   , "deps": [["src/utils/cpp", "transformed_range"], ["@", "gsl", "", "gsl"]]
+  , "stage": ["src", "buildtool", "execution_api", "common"]
+  }
+, "artifact_blob_container":
+  { "type": ["@", "rules", "CC", "library"]
+  , "name": ["artifact_blob_container"]
+  , "hdrs": ["artifact_blob_container.hpp"]
+  , "deps": ["content_blob_container", ["src/buildtool/common", "common"]]
+  , "stage": ["src", "buildtool", "execution_api", "common"]
   }
 }
diff --git a/src/buildtool/execution_api/git/TARGETS b/src/buildtool/execution_api/git/TARGETS
index 2c614f08..34b2e4dd 100644
--- a/src/buildtool/execution_api/git/TARGETS
+++ b/src/buildtool/execution_api/git/TARGETS
@@ -9,6 +9,7 @@
     , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"]
     , ["src/buildtool/execution_api/common", "common"]
     , ["src/buildtool/execution_api/common", "common_api"]
+    , ["src/buildtool/execution_api/common", "artifact_blob_container"]
     , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/logging", "logging"]
     , ["src/buildtool/crypto", "hash_function"]
diff --git a/src/buildtool/execution_api/local/TARGETS b/src/buildtool/execution_api/local/TARGETS
index f3949310..e457d712 100644
--- a/src/buildtool/execution_api/local/TARGETS
+++ b/src/buildtool/execution_api/local/TARGETS
@@ -30,6 +30,7 @@
     , ["src/buildtool/common", "config"]
     , ["src/buildtool/storage", "storage"]
     , ["src/buildtool/execution_api/common", "common"]
+    , ["src/buildtool/execution_api/common", "artifact_blob_container"]
     , ["src/buildtool/execution_api/common", "common_api"]
     , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"]
     , ["src/buildtool/execution_api/git", "git"]
diff --git a/src/buildtool/execution_api/remote/TARGETS b/src/buildtool/execution_api/remote/TARGETS
index 7c45ec8d..c87bdbb9 100644
--- a/src/buildtool/execution_api/remote/TARGETS
+++ b/src/buildtool/execution_api/remote/TARGETS
@@ -26,6 +26,7 @@
     , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/logging", "logging"]
     , ["src/buildtool/execution_api/common", "common"]
+    , ["src/buildtool/execution_api/common", "artifact_blob_container"]
     , ["@", "gsl", "", "gsl"]
     , ["src/buildtool/common", "bazel_types"]
     , ["src/buildtool/execution_api/bazel_msg", "bazel_msg"]
@@ -83,6 +84,7 @@
     , ["src/buildtool/compatibility", "compatibility"]
     , ["src/buildtool/multithreading", "task_system"]
     , ["src/buildtool/execution_api/common", "common"]
+    , ["src/buildtool/execution_api/common", "artifact_blob_container"]
     , ["src/buildtool/file_system", "file_system_manager"]
     , ["src/buildtool/file_system", "object_type"]
     , ["src/buildtool/logging", "log_level"]
diff --git a/src/buildtool/execution_engine/executor/TARGETS b/src/buildtool/execution_engine/executor/TARGETS
index 15ca2441..85e48a00 100644
--- a/src/buildtool/execution_engine/executor/TARGETS
+++ b/src/buildtool/execution_engine/executor/TARGETS
@@ -13,6 +13,7 @@
     , ["src/buildtool/execution_engine/dag", "dag"]
     , ["src/buildtool/execution_api/common", "api_bundle"]
     , ["src/buildtool/execution_api/common", "common"]
+    , ["src/buildtool/execution_api/common", "artifact_blob_container"]
     , ["src/buildtool/execution_api/common", "common_api"]
     , ["src/buildtool/execution_api/remote", "config"]
     , ["src/buildtool/execution_api/remote", "context"]
diff --git a/src/buildtool/graph_traverser/TARGETS b/src/buildtool/graph_traverser/TARGETS
index 3c64489b..a44d25a7 100644
--- a/src/buildtool/graph_traverser/TARGETS
+++ b/src/buildtool/graph_traverser/TARGETS
@@ -11,6 +11,7 @@
     , ["src/buildtool/execution_engine/executor", "executor"]
     , ["src/buildtool/execution_engine/traverser", "traverser"]
     , ["src/buildtool/execution_api/common", "common"]
+    , ["src/buildtool/execution_api/common", "artifact_blob_container"]
     , ["src/buildtool/execution_api/common", "common_api"]
     , ["src/buildtool/execution_api/remote", "config"]
     , ["src/buildtool/execution_api/utils", "subobject"]