Don't hardcode the super partition name.
Bug: 116608795
Test: update_engine_unittests --gtest_filter=*BootControlAndroid*
Change-Id: Ibf5b0596278d280c7c47b110e7ba96bc04b28472
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) {
diff --git a/boot_control_android_unittest.cc b/boot_control_android_unittest.cc
index ea5e808..3e01be2 100644
--- a/boot_control_android_unittest.cc
+++ b/boot_control_android_unittest.cc
@@ -19,6 +19,7 @@
#include <set>
#include <android-base/strings.h>
+#include <fs_mgr.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
@@ -78,7 +79,7 @@
return kFakeDevicePath + name;
}
inline std::string GetSuperDevice() {
- return GetDevice(LP_METADATA_PARTITION_NAME);
+ return GetDevice(fs_mgr_get_super_partition_name());
}
struct TestParam {
