Update the return type of the version helper

Also update the callsite, so there are no problems with scope of objects. Bug: 393455992
google · Jan 31, 2025 · 4ae6404 · 4ae6404
1 parent a4edaef
commit 4ae6404
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/base/cvd/build_version.h.in b/base/cvd/build_version.h.in
@@ -17,14 +17,13 @@
 #ifndef BUILD_VERSION_H
 #define BUILD_VERSION_H
 
-#include <string_view>
+#include <string>
 
 namespace android {
 namespace build {
 
-inline std::string_view GetBuildNumber() {
-  static constexpr char kBuildNumber[] = "@VCS_TAG@";
-  return kBuildNumber;
+std::string GetBuildNumber() {
+  return "@VCS_TAG@";
 }
 
 } // namespace build

diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/version.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/version.cpp
@@ -48,7 +48,7 @@ class CvdVersionHandler : public CvdCommandHandler {
     fmt::print(std::cout, "major: {}\n", cvd::kVersionMajor);
     fmt::print(std::cout, "minor: {}\n", cvd::kVersionMinor);
 
-    std::string_view build = android::build::GetBuildNumber();
+    const std::string build = android::build::GetBuildNumber();
     if (!build.empty()) {
       fmt::print(std::cout, "build: {}\n", build);
     }