ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "liblp: Allow "flashing" files on the host."

Browse source
This commit is contained in:
David Anderson 2019-11-26 00:18:12 +00:00 • committed by Gerrit Code Review
commit d70c322138
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fs_mgr/liblp/writer.cpp
View file

@ -83,8 +83,9 @@ std::string SerializeMetadata(const LpMetadata& input) {
// Perform sanity checks so we don't accidentally overwrite valid metadata
// with potentially invalid metadata, or random partition data with metadata.
static bool ValidateAndSerializeMetadata(const IPartitionOpener& opener, const LpMetadata& metadata,
const std::string& slot_suffix, std::string* blob) {
static bool ValidateAndSerializeMetadata([[maybe_unused]] const IPartitionOpener& opener,
const LpMetadata& metadata, const std::string& slot_suffix,
std::string* blob) {
const LpMetadataGeometry& geometry = metadata.geometry;
*blob = SerializeMetadata(metadata);
@ -128,6 +129,10 @@ static bool ValidateAndSerializeMetadata(const IPartitionOpener& opener, const L
<< block_device.first_logical_sector << " for size " << block_device.size;
return false;
}
// When flashing on the device, check partition sizes. Don't do this on
// the host since there is no way to verify.
#if defined(__ANDROID__)
BlockDeviceInfo info;
if (!opener.GetInfo(partition_name, &info)) {
PERROR << partition_name << ": ioctl";
@ -138,6 +143,7 @@ static bool ValidateAndSerializeMetadata(const IPartitionOpener& opener, const L
<< block_device.size << ", got " << info.size << ")";
return false;
}
#endif
}
// Make sure all partition entries reference valid extents.