commit 8f2745c31db3ac75e56af6c39df65f620fcb8619
author Yifan Hong <elsk@google.com> Fri Aug 16 11:45:13 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 16 11:45:13 2019 -0700
tree 8ed2eb5729267882eea208df9db1b47ed0dddf96
parent 9f1625a1155008d73e56a12012ea4515a7fd0d76
parent 0df5805d21e7794e9e7543116c67eb745beaf387

Merge "updater: Fix build for new CreateLogicalPartition signature." am: 18c3f78779 am: 41fd3c3ad9
am: 0df5805d21

Change-Id: Ib90ad40cbe99ebe0154ea439e0560d8e5bd109b8

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) {