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

Commit 932bc6a9 authored by Daniel Zheng's avatar Daniel Zheng Committed by Automerger Merge Worker
Browse files

Merge "Moving includes" into main am: dc3c5292 am: 07895506 am: fb1e0e7f... 

Merge "Moving includes" into main am: dc3c5292 am: 07895506 am: fb1e0e7f am: 253944ff am: 31bb1379

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



Change-Id: I39afbebc15d397c3b65b445667733bdacfa93525
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0341b076 31bb1379

fs_mgr/libsnapshot/include/libsnapshot/cow_writer.h

+0 −3
Original line number Diff line number Diff line
@@ -18,14 +18,11 @@ 


#include <condition_variable>

#include <cstdint>

#include <future>

#include <memory>

#include <mutex>

#include <optional>

#include <queue>

#include <string>

#include <thread>

#include <utility>

#include <vector>



#include <android-base/unique_fd.h>

fs_mgr/libsnapshot/libsnapshot_cow/writer_v2.cpp

+1 −1
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
#include <sys/uio.h>

#include <unistd.h>



#include <future>

#include <limits>

#include <queue>



#include <android-base/file.h>

#include <android-base/logging.h>

fs_mgr/libsnapshot/libsnapshot_cow/writer_v2.h

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


#pragma once



#include <future>

#include "writer_base.h"



namespace android {