update_engine: Update libchrome APIs to r369476
The new libchrome has been ported from Chromium and some APIs have
changed. Make necessary changes at call sites.
Change-Id: I42e65bda7f1dbdf6f6e0ebf356d2cfea6b729193
diff --git a/payload_consumer/delta_performer.cc b/payload_consumer/delta_performer.cc
index e56bb75..09304e4 100644
--- a/payload_consumer/delta_performer.cc
+++ b/payload_consumer/delta_performer.cc
@@ -171,8 +171,8 @@
const char* message_prefix) {
// Compute our download and overall progress.
unsigned new_overall_progress = 0;
- COMPILE_ASSERT(kProgressDownloadWeight + kProgressOperationsWeight == 100,
- progress_weight_dont_add_up);
+ static_assert(kProgressDownloadWeight + kProgressOperationsWeight == 100,
+ "Progress weights don't add up");
// Only consider download progress if its total size is known; otherwise
// adjust the operations weight to compensate for the absence of download
// progress. Also, make sure to cap the download portion at
@@ -409,8 +409,8 @@
}
// Extract the payload version from the metadata.
- COMPILE_ASSERT(sizeof(major_payload_version_) == kDeltaVersionSize,
- major_payload_version_size_mismatch);
+ static_assert(sizeof(major_payload_version_) == kDeltaVersionSize,
+ "Major payload version size mismatch");
memcpy(&major_payload_version_,
&payload[kDeltaVersionOffset],
kDeltaVersionSize);
@@ -435,8 +435,8 @@
return kMetadataParseInsufficientData;
// Next, parse the manifest size.
- COMPILE_ASSERT(sizeof(manifest_size_) == kDeltaManifestSizeSize,
- manifest_size_size_mismatch);
+ static_assert(sizeof(manifest_size_) == kDeltaManifestSizeSize,
+ "manifest_size size mismatch");
memcpy(&manifest_size_,
&payload[kDeltaManifestSizeOffset],
kDeltaManifestSizeSize);
@@ -444,9 +444,9 @@
if (GetMajorVersion() == kBrilloMajorPayloadVersion) {
// Parse the metadata signature size.
- COMPILE_ASSERT(sizeof(metadata_signature_size_) ==
- kDeltaMetadataSignatureSizeSize,
- metadata_signature_size_size_mismatch);
+ static_assert(sizeof(metadata_signature_size_) ==
+ kDeltaMetadataSignatureSizeSize,
+ "metadata_signature_size size mismatch");
uint64_t metadata_signature_size_offset;
if (!GetMetadataSignatureSizeOffset(&metadata_signature_size_offset)) {
*error = ErrorCode::kError;