commit f3928fb5f02cbfb8e76be4407b2d39785de5f983
author David Anderson <dvander@google.com> Tue Oct 16 19:02:46 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 16 19:02:46 2018 -0700
tree bd36a8300d747a2fe50c95ca92d08d2ea69bebbd
parent b2d01272c75f34b762214f4e21e9dd7a9c69e777
parent 28c52b9ec525aca2073bbb270d28755d9f9614f8

Merge "liblp: Add partitions to the correct group when writing LpMetadata."
am: 4bc53d20af

Change-Id: I0f44870a19766df99aacf5900595f1e91b66d2bf

fs_mgr/liblp/builder.cpp

diff --git a/fs_mgr/liblp/builder.cpp b/fs_mgr/liblp/builder.cpp
index 3d4b826..03fd5f9 100644
--- a/fs_mgr/liblp/builder.cpp
+++ b/fs_mgr/liblp/builder.cpp
@@ -505,6 +505,7 @@
         strncpy(out.name, group->name().c_str(), sizeof(out.name));
         out.maximum_size = group->maximum_size();
 
+        group_indices[group->name()] = metadata->groups.size();
         metadata->groups.push_back(out);
     }
 
@@ -528,6 +529,14 @@
         part.num_extents = static_cast<uint32_t>(partition->extents().size());
         part.attributes = partition->attributes();
 
+        auto iter = group_indices.find(partition->group_name());
+        if (iter == group_indices.end()) {
+            LERROR << "Partition " << partition->name() << " is a member of unknown group "
+                   << partition->group_name();
+            return nullptr;
+        }
+        part.group_index = iter->second;
+
         for (const auto& extent : partition->extents()) {
             extent->AddTo(metadata.get());
         }