| commit | dc3c5292c70bd602d5e769c18490680bae16fc49 | [log] [tgz] |
|---|---|---|
| author | Daniel Zheng <zhengdaniel@google.com> | Wed Aug 09 20:04:00 2023 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Aug 09 20:04:00 2023 +0000 |
| tree | 45bb1c17ae6665f7f70a67f1ec8b46456485db7c | |
| parent | 73846d68cf8a8ffd72a700fc4c3eeca6ad909ed7 [diff] | |
| parent | fe6c1d55f72da9429fcae161cd582125e59b027c [diff] |
Merge "Moving includes" into main
diff --git a/fs_mgr/libsnapshot/include/libsnapshot/cow_writer.h b/fs_mgr/libsnapshot/include/libsnapshot/cow_writer.h index 755050f..74b8bb8 100644 --- a/fs_mgr/libsnapshot/include/libsnapshot/cow_writer.h +++ b/fs_mgr/libsnapshot/include/libsnapshot/cow_writer.h
@@ -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>
diff --git a/fs_mgr/libsnapshot/libsnapshot_cow/writer_v2.cpp b/fs_mgr/libsnapshot/libsnapshot_cow/writer_v2.cpp index 4ab5713..6d04c6a 100644 --- a/fs_mgr/libsnapshot/libsnapshot_cow/writer_v2.cpp +++ b/fs_mgr/libsnapshot/libsnapshot_cow/writer_v2.cpp
@@ -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>
diff --git a/fs_mgr/libsnapshot/libsnapshot_cow/writer_v2.h b/fs_mgr/libsnapshot/libsnapshot_cow/writer_v2.h index 1aa8518..3f357e0 100644 --- a/fs_mgr/libsnapshot/libsnapshot_cow/writer_v2.h +++ b/fs_mgr/libsnapshot/libsnapshot_cow/writer_v2.h
@@ -14,6 +14,7 @@ #pragma once +#include <future> #include "writer_base.h" namespace android {