diff options
| author | David Anderson <dvander@google.com> | 2018-10-03 14:15:25 -0700 |
|---|---|---|
| committer | David Anderson <dvander@google.com> | 2018-10-03 14:21:00 -0700 |
| commit | 4b92c1c61b088ea2505f8191c2d91ae792cdfbc2 (patch) | |
| tree | d0c89c33117bee3095c5c8a1684e02936047e54b /boot_control_android_unittest.cc | |
| parent | a778e5b5f636c26c205dc2730a5289a5729c6743 (diff) | |
Don't pass a guid to MetadataBuilder::AddPartition.
GUIDs are being removed from the super partition, so remove
update_engine code that uses them.
Bug: 117229984
Test: update_engine_unittests --gtest_filter=*BootControlAndroid*
Change-Id: Ia91e7bed8e5d25535e568fa2aa9cb8854479156a
Diffstat (limited to 'boot_control_android_unittest.cc')
| -rw-r--r-- | boot_control_android_unittest.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/boot_control_android_unittest.cc b/boot_control_android_unittest.cc index 9744b425..ea5e808a 100644 --- a/boot_control_android_unittest.cc +++ b/boot_control_android_unittest.cc @@ -48,7 +48,6 @@ constexpr const char* kSlotSuffixes[kMaxNumSlots] = {"_a", "_b"}; constexpr const char* kFakeDevicePath = "/fake/dev/path/"; constexpr const char* kFakeMappedPath = "/fake/mapped/path/"; constexpr const uint32_t kFakeMetadataSize = 65536; -constexpr const char* kZeroGuid = "00000000-0000-0000-0000-000000000000"; // A map describing the size of each partition. using PartitionSizes = std::map<std::string, uint64_t>; @@ -97,7 +96,7 @@ std::unique_ptr<MetadataBuilder> NewFakeMetadata(const PartitionSizes& sizes) { if (builder == nullptr) return nullptr; for (const auto& pair : sizes) { - auto p = builder->AddPartition(pair.first, kZeroGuid, 0 /* attr */); + auto p = builder->AddPartition(pair.first, 0 /* attr */); EXPECT_TRUE(p && builder->ResizePartition(p, pair.second)); } return builder; |