Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c74d6ca authored by Yi Kong's avatar Yi Kong Committed by Automerger Merge Worker
Browse files

Merge "Fix build with ToT libc++" into main am: c0305b14 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3100441



Change-Id: I9be076510a08abdd42cd0fcfc9e25434382f4aa0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3e6d7d3e c0305b14

fs_mgr/libsnapshot/include/libsnapshot/cow_compress.h

+3 −1
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#pragma once



#include <memory>

#include <vector>



#include "libsnapshot/cow_format.h"



namespace android {

fs_mgr/libsnapshot/include/libsnapshot/cow_reader.h

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <memory>

#include <optional>

#include <unordered_map>

#include <vector>



#include <android-base/unique_fd.h>

#include <libsnapshot/cow_format.h>