diff options
| author | David Anderson <dvander@google.com> | 2018-10-01 14:15:00 -0700 |
|---|---|---|
| committer | Treehugger Robot <treehugger-gerrit@google.com> | 2018-10-04 19:29:33 +0000 |
| commit | d63cb3ccd76d6df10c603152843881d719da26e3 (patch) | |
| tree | 556b93964d26259ec6188f075705fdda21d5e13f | |
| parent | 4b92c1c61b088ea2505f8191c2d91ae792cdfbc2 (diff) | |
Don't hardcode the super partition name.
Bug: 116608795
Test: update_engine_unittests --gtest_filter=*BootControlAndroid*
Change-Id: Ibf5b0596278d280c7c47b110e7ba96bc04b28472
| -rw-r--r-- | boot_control_android.cc | 4 | ||||
| -rw-r--r-- | boot_control_android_unittest.cc | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/boot_control_android.cc b/boot_control_android.cc index 7aa72c3b..ad819ad4 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 @@ bool BootControlAndroid::InitPartitionMetadata( 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 ea5e808a..3e01be23 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 @@ inline std::string GetDevice(const std::string& name) { return kFakeDevicePath + name; } inline std::string GetSuperDevice() { - return GetDevice(LP_METADATA_PARTITION_NAME); + return GetDevice(fs_mgr_get_super_partition_name()); } struct TestParam { |