commit d63cb3ccd76d6df10c603152843881d719da26e3
author David Anderson <dvander@google.com> Mon Oct 01 14:15:00 2018 -0700
committer Treehugger Robot <treehugger-gerrit@google.com> Thu Oct 04 19:29:33 2018 +0000
tree 556b93964d26259ec6188f075705fdda21d5e13f
parent 4b92c1c61b088ea2505f8191c2d91ae792cdfbc2

Don't hardcode the super partition name.

Bug: 116608795
Test: update_engine_unittests --gtest_filter=*BootControlAndroid*
Change-Id: Ibf5b0596278d280c7c47b110e7ba96bc04b28472

boot_control_android.cc

diff --git a/boot_control_android.cc b/boot_control_android.cc
index 7aa72c3..ad819ad 100644
--- a/boot_control_android.cc
+++ b/boot_control_android.cc
@@ -23,6 +23,7 @@
 #include <base/logging.h>
 #include <bootloader_message/bootloader_message.h>
 #include <brillo/message_loops/message_loop.h>
+#include <fs_mgr.h>
 
 #include "update_engine/common/utils.h"
 #include "update_engine/dynamic_partition_control_android.h"
@@ -394,7 +395,8 @@
     return false;
   }
   base::FilePath device_dir(device_dir_str);
-  string super_device = device_dir.Append(LP_METADATA_PARTITION_NAME).value();
+  string super_device =
+      device_dir.Append(fs_mgr_get_super_partition_name()).value();
 
   Slot current_slot = GetCurrentSlot();
   if (target_slot == current_slot) {