commit 7599c219c85d578d2a3f28a8d28b447091ee31c9
author Vic Yang <victoryang@google.com> Mon Aug 05 21:35:31 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Aug 05 21:35:31 2019 -0700
tree 881702eca52fa956b415f5d8ca6191c62f8a5e67
parent 29af7f3a7cc80534d060e5381d2c7a407285bcc5
parent b1d0ac9e4524040adee7dbf5fa9ca01fad61aab8

Merge "liblp: Make kDefaultGroup a string_view"
am: e5fa9b80ac

Change-Id: Ia1b6b26e2db72d4168b1295fc4ca7ef7bd1261ea

fs_mgr/liblp/builder.cpp

diff --git a/fs_mgr/liblp/builder.cpp b/fs_mgr/liblp/builder.cpp
index 8797ea9..a434c93 100644
--- a/fs_mgr/liblp/builder.cpp
+++ b/fs_mgr/liblp/builder.cpp
@@ -19,6 +19,7 @@
 #include <string.h>
 
 #include <algorithm>
+#include <string_view>
 
 #include <android-base/properties.h>
 #include <android-base/unique_fd.h>
@@ -33,7 +34,7 @@
 std::optional<bool> MetadataBuilder::sABOverride;
 std::optional<bool> MetadataBuilder::sRetrofitDap;
 
-static const std::string kDefaultGroup = "default";
+static constexpr std::string_view kDefaultGroup = "default";
 
 bool LinearExtent::AddTo(LpMetadata* out) const {
     if (device_index_ >= out->block_devices.size()) {
@@ -414,7 +415,7 @@
     geometry_.metadata_slot_count = metadata_slot_count;
     geometry_.logical_block_size = logical_block_size;
 
-    if (!AddGroup(kDefaultGroup, 0)) {
+    if (!AddGroup(std::string(kDefaultGroup), 0)) {
         return false;
     }
     return true;
@@ -430,7 +431,7 @@
 }
 
 Partition* MetadataBuilder::AddPartition(const std::string& name, uint32_t attributes) {
-    return AddPartition(name, kDefaultGroup, attributes);
+    return AddPartition(name, std::string(kDefaultGroup), attributes);
 }
 
 Partition* MetadataBuilder::AddPartition(const std::string& name, const std::string& group_name,