| commit | 7c74d6ca60eccd51904d33f9340debd30a4d51b7 | [log] [tgz] |
|---|---|---|
| author | Yi Kong <yikong@google.com> | Fri May 24 01:26:05 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 24 01:26:05 2024 +0000 |
| tree | 37025affa234ba867e3ad630e8eda67a2b3c592f | |
| parent | 3e6d7d3e57ecd0c5e25afabcca64c2ef15ce0716 [diff] | |
| parent | c0305b145f092df1f83fb31c752b936716dfe682 [diff] |
Merge "Fix build with ToT libc++" into main am: c0305b145f Original change: https://android-review.googlesource.com/c/platform/system/core/+/3100441 Change-Id: I9be076510a08abdd42cd0fcfc9e25434382f4aa0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/fs_mgr/libsnapshot/include/libsnapshot/cow_compress.h b/fs_mgr/libsnapshot/include/libsnapshot/cow_compress.h index 21dc666..635a38c 100644 --- a/fs_mgr/libsnapshot/include/libsnapshot/cow_compress.h +++ b/fs_mgr/libsnapshot/include/libsnapshot/cow_compress.h
@@ -17,6 +17,8 @@ #pragma once #include <memory> +#include <vector> + #include "libsnapshot/cow_format.h" namespace android { @@ -50,4 +52,4 @@ const uint32_t block_size_; }; } // namespace snapshot -} // namespace android \ No newline at end of file +} // namespace android
diff --git a/fs_mgr/libsnapshot/include/libsnapshot/cow_reader.h b/fs_mgr/libsnapshot/include/libsnapshot/cow_reader.h index 3f49c69..3389f58 100644 --- a/fs_mgr/libsnapshot/include/libsnapshot/cow_reader.h +++ b/fs_mgr/libsnapshot/include/libsnapshot/cow_reader.h
@@ -19,6 +19,7 @@ #include <memory> #include <optional> #include <unordered_map> +#include <vector> #include <android-base/unique_fd.h> #include <libsnapshot/cow_format.h>