commit 4c891c94214702d57f81b5892bcccf3e38bf09a1
author David Anderson <dvander@google.com> Fri Jun 21 17:45:23 2019 -0700
committer David Anderson <dvander@google.com> Sat Jul 13 18:02:03 2019 +0000
tree 2897fcdd2f099bb2e7ef3b3c4b18a863c47a5599
parent 500ca135b771d41700c91ae716bf9c9179d29bef

Fix build for API change to DestroyLogicalPartition().

This method no longer uses a timeout parameter.

Bug: 135771280
Test: update_engine and update_engine_unittests build
Change-Id: If4764bf2d60c6b3aac1e8052c7fbb013c7b3349d

boot_control_android_unittest.cc

diff --git a/boot_control_android_unittest.cc b/boot_control_android_unittest.cc
index 65c2381..94e195f 100644
--- a/boot_control_android_unittest.cc
+++ b/boot_control_android_unittest.cc
@@ -321,12 +321,12 @@
   // slot with each partition in |partitions|.
   void ExpectUnmap(const std::set<string>& partitions) {
     // Error when UnmapPartitionOnDeviceMapper is called on unknown arguments.
-    ON_CALL(dynamicControl(), UnmapPartitionOnDeviceMapper(_, _))
+    ON_CALL(dynamicControl(), UnmapPartitionOnDeviceMapper(_))
         .WillByDefault(Return(false));
 
     for (const auto& partition : partitions) {
-      EXPECT_CALL(dynamicControl(), UnmapPartitionOnDeviceMapper(partition, _))
-          .WillOnce(Invoke([this](auto partition, auto) {
+      EXPECT_CALL(dynamicControl(), UnmapPartitionOnDeviceMapper(partition))
+          .WillOnce(Invoke([this](auto partition) {
             mapped_devices_.erase(partition);
             return true;
           }));
@@ -531,7 +531,7 @@
                {T("system"), 2_GiB},
                {T("vendor"), 1_GiB}});
   // Should not try to unmap any target partition.
-  EXPECT_CALL(dynamicControl(), UnmapPartitionOnDeviceMapper(_, _)).Times(0);
+  EXPECT_CALL(dynamicControl(), UnmapPartitionOnDeviceMapper(_)).Times(0);
   // Should not store metadata to target slot.
   EXPECT_CALL(dynamicControl(),
               StoreMetadata(GetSuperDevice(target()), _, target()))