2424#include < memory>
2525#include < set>
2626#include < string>
27+ #include < string_view>
2728#include < vector>
2829
29- #include < android-base/logging.h>
30- #include < android-base/strings.h>
31- #include < fmt/core.h>
32- #include < fmt/format.h>
33- #include < json/reader.h>
34- #include < json/value.h>
30+ #include " absl/strings/str_cat.h"
31+ #include " android-base/logging.h"
32+ #include " android-base/strings.h"
33+ #include " fmt/core.h"
34+ #include " fmt/format.h"
35+ #include " json/reader.h"
36+ #include " json/value.h"
3537
3638#include " cuttlefish/common/libs/utils/environment.h"
3739#include " cuttlefish/common/libs/utils/files.h"
@@ -565,18 +567,16 @@ std::string CuttlefishConfig::instances_dir() const {
565567 return AbsolutePath (root_dir () + " /instances" );
566568}
567569
568- std::string CuttlefishConfig::InstancesPath (
569- const std::string& file_name) const {
570- return AbsolutePath (instances_dir () + " /" + file_name);
570+ std::string CuttlefishConfig::InstancesPath (std::string_view file_name) const {
571+ return AbsolutePath (absl::StrCat (instances_dir (), " /" , file_name));
571572}
572573
573574std::string CuttlefishConfig::assembly_dir () const {
574575 return AbsolutePath (root_dir () + " /assembly" );
575576}
576577
577- std::string CuttlefishConfig::AssemblyPath (
578- const std::string& file_name) const {
579- return AbsolutePath (assembly_dir () + " /" + file_name);
578+ std::string CuttlefishConfig::AssemblyPath (std::string_view file_name) const {
579+ return AbsolutePath (absl::StrCat (assembly_dir (), " /" , file_name));
580580}
581581
582582static constexpr char kInstancesUdsDir [] = " instances_uds_dir" ;
@@ -588,17 +588,17 @@ std::string CuttlefishConfig::instances_uds_dir() const {
588588}
589589
590590std::string CuttlefishConfig::InstancesUdsPath (
591- const std::string& file_name) const {
592- return AbsolutePath (instances_uds_dir () + " /" + file_name);
591+ std::string_view file_name) const {
592+ return AbsolutePath (absl::StrCat ( instances_uds_dir (), " /" , file_name) );
593593}
594594
595595std::string CuttlefishConfig::environments_dir () const {
596596 return AbsolutePath (root_dir () + " /environments" );
597597}
598598
599599std::string CuttlefishConfig::EnvironmentsPath (
600- const std::string& file_name) const {
601- return AbsolutePath (environments_dir () + " /" + file_name);
600+ std::string_view file_name) const {
601+ return AbsolutePath (absl::StrCat ( environments_dir (), " /" , file_name) );
602602}
603603
604604static constexpr char kEnvironmentsUdsDir [] = " environments_uds_dir" ;
@@ -610,8 +610,8 @@ std::string CuttlefishConfig::environments_uds_dir() const {
610610}
611611
612612std::string CuttlefishConfig::EnvironmentsUdsPath (
613- const std::string& file_name) const {
614- return AbsolutePath (environments_uds_dir () + " /" + file_name);
613+ std::string_view file_name) const {
614+ return AbsolutePath (absl::StrCat ( environments_uds_dir (), " /" , file_name) );
615615}
616616
617617CuttlefishConfig::MutableInstanceSpecific CuttlefishConfig::ForInstance (int num) {
0 commit comments