commit 41fd3c3ad92b67a6f5fcee17e702158d617f055e
author Yifan Hong <elsk@google.com> Fri Aug 16 11:24:53 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 16 11:24:53 2019 -0700
tree 8ed2eb5729267882eea208df9db1b47ed0dddf96
parent 03fd851f611a2ad624a09e6e089dc5e8c029c62c
parent 18c3f78779792088c56cb6cdd353f7c502876d4c

Merge "updater: Fix build for new CreateLogicalPartition signature."
am: 18c3f78779

Change-Id: Id0deb6160cf5b1bd04c99081a766df412a26e7f5

updater/updater_runtime_dynamic_partitions.cpp

diff --git a/updater/updater_runtime_dynamic_partitions.cpp b/updater/updater_runtime_dynamic_partitions.cpp
index b084f65..be9250a 100644
--- a/updater/updater_runtime_dynamic_partitions.cpp
+++ b/updater/updater_runtime_dynamic_partitions.cpp
@@ -35,6 +35,7 @@
 using android::dm::DeviceMapper;
 using android::dm::DmDeviceState;
 using android::fs_mgr::CreateLogicalPartition;
+using android::fs_mgr::CreateLogicalPartitionParams;
 using android::fs_mgr::DestroyLogicalPartition;
 using android::fs_mgr::LpMetadata;
 using android::fs_mgr::MetadataBuilder;
@@ -64,8 +65,14 @@
                                                 std::string* path) {
   auto state = DeviceMapper::Instance().GetState(partition_name);
   if (state == DmDeviceState::INVALID) {
-    return CreateLogicalPartition(GetSuperDevice(), 0 /* metadata slot */, partition_name,
-                                  true /* force writable */, kMapTimeout, path);
+    CreateLogicalPartitionParams params = {
+      .block_device = GetSuperDevice(),
+      .metadata_slot = 0,
+      .partition_name = partition_name,
+      .force_writable = true,
+      .timeout_ms = kMapTimeout,
+    };
+    return CreateLogicalPartition(params, path);
   }
 
   if (state == DmDeviceState::ACTIVE) {