Only one defiinition of kDefaultUuidPrefix
Bug: 110478603
Test: local
Change-Id: Ibaad867d06805c5533e0ea221dfd24c94b4ed7df
diff --git a/host/commands/launch/main.cc b/host/commands/launch/main.cc
index df3b3c5..24ca361 100644
--- a/host/commands/launch/main.cc
+++ b/host/commands/launch/main.cc
@@ -161,8 +161,7 @@
// TODO(b/72969289) This should be generated
DEFINE_string(dtb, "", "Path to the cuttlefish.dtb file");
-constexpr char kDefaultUuidPrefix[] = "699acfc4-c8c4-11e7-882b-5065f31dc1";
-DEFINE_string(uuid, vsoc::GetPerInstanceDefault(kDefaultUuidPrefix).c_str(),
+DEFINE_string(uuid, vsoc::GetPerInstanceDefault(vsoc::kDefaultUuidPrefix),
"UUID to use for the device. Random if not specified");
DEFINE_bool(daemon, false,
"Run cuttlefish in background, the launcher exits on boot "
diff --git a/host/libs/config/cuttlefish_config.cpp b/host/libs/config/cuttlefish_config.cpp
index a48fdd3..0cc4de4 100644
--- a/host/libs/config/cuttlefish_config.cpp
+++ b/host/libs/config/cuttlefish_config.cpp
@@ -38,8 +38,6 @@
namespace {
-constexpr char kDefaultUuidPrefix[] = "699acfc4-c8c4-11e7-882b-5065f31dc1";
-
int InstanceFromEnvironment() {
static constexpr char kInstanceEnvironmentVariable[] = "CUTTLEFISH_INSTANCE";
static constexpr char kVsocUserPrefix[] = "vsoc-";
diff --git a/host/libs/config/cuttlefish_config.h b/host/libs/config/cuttlefish_config.h
index f274806..b95c9ed 100644
--- a/host/libs/config/cuttlefish_config.h
+++ b/host/libs/config/cuttlefish_config.h
@@ -24,6 +24,8 @@
namespace vsoc {
+constexpr char kDefaultUuidPrefix[] = "699acfc4-c8c4-11e7-882b-5065f31dc1";
+
// Holds the configuration of the cuttlefish instances.
class CuttlefishConfig {
public:
