commit 13faa1b39414470e43aa6b1f053d0e14b9cd72ed
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jun 28 05:48:17 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 28 05:48:17 2022 +0000
tree e129e16a3f6fc9ec36726c153a30550ad65aa612
parent 1cdb22fb05334a9b41bb7fa1c6b0d0f3756b4d7d
parent 01a7dcb24009e7088976d29cd80d4952d881db49

Merge "first_stage_init: Optimize redundant vector copy"

init/first_stage_mount.cpp

diff --git a/init/first_stage_mount.cpp b/init/first_stage_mount.cpp
index 042988e..4bbbc20 100644
--- a/init/first_stage_mount.cpp
+++ b/init/first_stage_mount.cpp
@@ -651,14 +651,9 @@
         return;
     }
 
-    std::string lp_names = "";
-    std::vector<std::string> dsu_partitions;
-    for (auto&& name : images->GetAllBackingImages()) {
-        dsu_partitions.push_back(name);
-        lp_names += name + ",";
-    }
-    // Publish the logical partition names for TransformFstabForDsu
-    WriteFile(gsi::kGsiLpNamesFile, lp_names);
+    // Publish the logical partition names for TransformFstabForDsu() and ReadFstabFromFile().
+    const auto dsu_partitions = images->GetAllBackingImages();
+    WriteFile(gsi::kGsiLpNamesFile, android::base::Join(dsu_partitions, ","));
     TransformFstabForDsu(&fstab_, active_dsu, dsu_partitions);
 }