Factor out references to /tmp/acloud_cvd_temp.

base/cvd/cuttlefish/host/commands/cvd/cli/commands/start.cpp

@@ -58,7 +58,6 @@
 #include "cuttlefish/host/commands/cvd/instances/instance_group_record.h"
 #include "cuttlefish/host/commands/cvd/instances/instance_manager.h"
 #include "cuttlefish/host/commands/cvd/instances/lock/instance_lock.h"
-#include "cuttlefish/host/commands/cvd/instances/lock/lock_file.h"
 #include "cuttlefish/host/commands/cvd/instances/operator_client.h"
 #include "cuttlefish/host/commands/cvd/instances/reset_client_utils.h"
 #include "cuttlefish/host/commands/cvd/utils/common.h"
@@ -299,9 +298,9 @@ class CvdStartCommandHandler : public CvdCommandHandler {
 Result<void> CvdStartCommandHandler::AcloudCompatActions(
     const LocalInstanceGroup& group, const cvd_common::Envs& envs,
     const CommandRequest& request) {
-  // rm -fr "TempDir()/acloud_cvd_temp/local-instance-<i>"
+  // rm -fr "InstanceLocksPath()/local-instance-<i>"
   std::string acloud_compat_home_prefix =
-      TempDir() + "/acloud_cvd_temp/local-instance-";
+      InstanceLocksPath() + "/local-instance-";
   std::vector<std::string> acloud_compat_homes;
   acloud_compat_homes.reserve(group.Instances().size());
   for (const auto& instance : group.Instances()) {

base/cvd/cuttlefish/host/commands/cvd/instances/lock/BUILD.bazel

@@ -22,6 +22,7 @@ cf_cc_library(
         "//cuttlefish/common/libs/utils:environment",
         "//cuttlefish/common/libs/utils:files",
         "//cuttlefish/common/libs/utils:result",
+        "//cuttlefish/host/commands/cvd/utils:common",
         "//libbase",
     ],
 )

base/cvd/cuttlefish/host/commands/cvd/instances/lock/instance_lock.cpp

@@ -37,6 +37,7 @@
 #include "cuttlefish/common/libs/utils/contains.h"
 #include "cuttlefish/common/libs/utils/files.h"
 #include "cuttlefish/common/libs/utils/result.h"
+#include "cuttlefish/host/commands/cvd/utils/common.h"
 
 namespace cuttlefish {
 
@@ -66,7 +67,7 @@ InstanceLockFileManager::InstanceLockFileManager() {}
 
 Result<std::string> InstanceLockFileManager::LockFilePath(int instance_num) {
   std::stringstream path;
-  path << TempDir() << "/acloud_cvd_temp/";
+  path << InstanceLocksPath();
   CF_EXPECT(EnsureDirectoryExists(path.str()));
   path << "local-instance-" << instance_num << ".lock";
   return path.str();

base/cvd/cuttlefish/host/commands/cvd/instances/reset_client_utils.cpp

@@ -155,7 +155,7 @@ Result<void> SendSignal(const GroupProcInfo& group_info) {
 }
 
 Result<void> DeleteLockFile(const GroupProcInfo& group_info) {
-  const std::string lock_dir = "/tmp/acloud_cvd_temp";
+  const std::string lock_dir = InstanceLocksPath();
   std::string lock_file_prefix = lock_dir;
   lock_file_prefix.append("/local-instance-");
 

base/cvd/cuttlefish/host/commands/cvd/utils/common.cpp

@@ -146,6 +146,10 @@ std::string InstanceDatabasePath() {
   return fmt::format("{}/instance_database.binpb", PerUserDir());
 }
 
+std::string InstanceLocksPath() {
+  return "/tmp/acloud_cvd_temp/";
+}
+
 std::string DefaultBaseDir() {
   auto time = std::chrono::system_clock::now().time_since_epoch().count();
   return fmt::format("{}/{}", PerUserDir(), time);

base/cvd/cuttlefish/host/commands/cvd/utils/common.h

@@ -83,6 +83,8 @@ std::string PerUserCacheDir();
 
 std::string InstanceDatabasePath();
 
+std::string InstanceLocksPath();
+
 std::string DefaultBaseDir();
 
 Result<std::string> GroupDirFromHome(std::string_view group_home_dir);