From ee549fa1ca1ff4a075c9b2634808525b014818ea Mon Sep 17 00:00:00 2001
From: Sascha Roloff <sascha.roloff@huawei.com>
Date: Wed, 21 Dec 2022 16:24:27 +0100
Subject: Refactor target cache key and entry to separate files and targets

---
 src/buildtool/build_engine/target_map/export.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/buildtool/build_engine/target_map/export.cpp')

diff --git a/src/buildtool/build_engine/target_map/export.cpp b/src/buildtool/build_engine/target_map/export.cpp
index 657ca73b..7a53e78e 100644
--- a/src/buildtool/build_engine/target_map/export.cpp
+++ b/src/buildtool/build_engine/target_map/export.cpp
@@ -19,6 +19,7 @@
 #include "src/buildtool/build_engine/base_maps/field_reader.hpp"
 #include "src/buildtool/build_engine/expression/configuration.hpp"
 #include "src/buildtool/build_engine/target_map/target_cache.hpp"
+#include "src/buildtool/build_engine/target_map/target_cache_key.hpp"
 #include "src/buildtool/common/statistics.hpp"
 #include "src/buildtool/execution_api/local/local_cas.hpp"
 
@@ -35,7 +36,7 @@ void FinalizeExport(
     const BuildMaps::Base::EntityName& target,
     const std::vector<std::string>& vars,
     const Configuration& effective_config,
-    const std::optional<TargetCache::Key>& target_cache_key,
+    const std::optional<TargetCacheKey>& target_cache_key,
     const BuildMaps::Target::TargetMap::LoggerPtr& logger,
     const BuildMaps::Target::TargetMap::SetterPtr& setter,
     const gsl::not_null<BuildMaps::Target::ResultTargetMap*>& result_map) {
@@ -129,7 +130,7 @@ void ExportRule(
     auto target_config = effective_config.Update(fixed_config);
 
     auto target_cache_key =
-        TargetCache::Key::Create(*exported_target, target_config);
+        TargetCacheKey::Create(*exported_target, target_config);
     if (target_cache_key) {
         if (auto target_cache_value =
                 TargetCache::Instance().Read(*target_cache_key)) {
-- 
cgit v1.2.3