Commit 0685af0f authored Nov 27, 2018 by Alistair Strachan

Allow non-A/B, non-retrofit devices to override super_partition

Some devices we want to test on, like cuttlefish, may not have a
partition table on any block device Android can see. The partitions are
simply exposed as separate block devices. This means we need to be able
to override the super_partition name to a regular block device name even
on non-A/B devices.

Bug: 113175337
Test: boot test on cuttlefish
Change-Id: I6ff460d0ba7b1e26cb5d60ba446737aa49549c18

parent 66a6d887

fs_mgr/fs_mgr.cpp

+0 −3

Original line number	Diff line number	Diff line
		@@ -1603,9 +1603,6 @@ std::string fs_mgr_get_super_partition_name(int slot) {
		} else if (slot == -1) {
		suffix = fs_mgr_get_slot_suffix();
		}
		if (suffix.empty()) {
		LFATAL << "Super partition name can only be overridden on A/B devices.";
		}
		return super_partition + suffix;
		}
		return LP_METADATA_DEFAULT_PARTITION_NAME;