From 9e95202e4de2c82497e12ae20b7fdc463f8ad376 Mon Sep 17 00:00:00 2001 From: Alessio Balsini Date: Mon, 14 Oct 2019 20:56:58 +0100 Subject: [PATCH] Publish chunk size in utility.h The chunk size of the snapshot should be kept consistent among different files. Move it to libsnapshot/utility.h to improve its visibility. Change-Id: I1cae6530a07c88f3a0091ca7d8bb2eb590a6710f Bug: 140835698 Test: m Signed-off-by: Alessio Balsini --- fs_mgr/libsnapshot/snapshot.cpp | 2 -- fs_mgr/libsnapshot/utility.h | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fs_mgr/libsnapshot/snapshot.cpp b/fs_mgr/libsnapshot/snapshot.cpp index 5b758c958..395fb40d8 100644 --- a/fs_mgr/libsnapshot/snapshot.cpp +++ b/fs_mgr/libsnapshot/snapshot.cpp @@ -71,8 +71,6 @@ using std::chrono::duration_cast; using namespace std::chrono_literals; using namespace std::string_literals; -// Unit is sectors, this is a 4K chunk. -static constexpr uint32_t kSnapshotChunkSize = 8; static constexpr char kBootIndicatorPath[] = "/metadata/ota/snapshot-boot"; class DeviceInfo final : public SnapshotManager::IDeviceInfo { diff --git a/fs_mgr/libsnapshot/utility.h b/fs_mgr/libsnapshot/utility.h index 75c694c10..305118432 100644 --- a/fs_mgr/libsnapshot/utility.h +++ b/fs_mgr/libsnapshot/utility.h @@ -27,6 +27,9 @@ namespace android { namespace snapshot { +// Unit is sectors, this is a 4K chunk. +static constexpr uint32_t kSnapshotChunkSize = 8; + struct AutoDevice { virtual ~AutoDevice(){}; void Release();