diff options
author | Amin Hassani <ahassani@chromium.org> | 2020-09-16 11:19:28 -0700 |
---|---|---|
committer | Amin Hassani <ahassani@chromium.org> | 2020-09-17 10:17:36 -0700 |
commit | e53b39b8b9c5c0871841bbbb86f23657c0b7f91b (patch) | |
tree | 12746e5e7e4716ba7fc94d3ed5c1a36c4d47d474 /payload_generator/blob_file_writer.cc | |
parent | a02a1f1dc837f22226499d9856a949fb180d099a (diff) | |
parent | 9956320ffa4edb340d20bd7f3c852a9e87437bd3 (diff) |
update_engine: Merge remote-tracking branch 'cros/upstream' into cros/master
Done with:
git merge cros/upstream --commit -s recursive
- Added EC key support and its unittests.
- Resolved a conlict on error codes. Since Android versions are not
uploading any UMA metrics, I gave the priority to the Android version
Since they can't be changed.
- Changed the openssl functions to get1 version (from get0) version
because of a current issue with gale. Once the issue is resolved we
need to change them back.
- Some remaining styling issues fixed by clang-format
BUG=b:163153182
TEST=CQ passes
TEST=unittests
Change-Id: Ib95034422b92433ce26e28336bc4806b34910d38
Diffstat (limited to 'payload_generator/blob_file_writer.cc')
-rw-r--r-- | payload_generator/blob_file_writer.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/payload_generator/blob_file_writer.cc b/payload_generator/blob_file_writer.cc index 7cdeb352..a1afe873 100644 --- a/payload_generator/blob_file_writer.cc +++ b/payload_generator/blob_file_writer.cc @@ -38,9 +38,9 @@ off_t BlobFileWriter::StoreBlob(const brillo::Blob& blob) { return result; } -void BlobFileWriter::SetTotalBlobs(size_t total_blobs) { - total_blobs_ = total_blobs; - stored_blobs_ = 0; +void BlobFileWriter::IncTotalBlobs(size_t increment) { + base::AutoLock auto_lock(blob_mutex_); + total_blobs_ += increment; } } // namespace chromeos_update_engine |