1Upstream-Status: Pending
2
3Forwarded: not-needed
4--- a/system/core/fs_mgr/liblp/reader.cpp
5+++ b/system/core/fs_mgr/liblp/reader.cpp
6@@ -22,6 +22,7 @@
7 #include <unistd.h>
8
9 #include <functional>
10+#include <cstring>
11
12 #include <android-base/file.h>
13 #include <android-base/unique_fd.h>
14--- a/system/core/fs_mgr/liblp/writer.cpp
15+++ b/system/core/fs_mgr/liblp/writer.cpp
16@@ -21,6 +21,7 @@
17 #include <unistd.h>
18
19 #include <string>
20+#include <cstring>
21
22 #include <android-base/file.h>
23 #include <android-base/unique_fd.h>
24--- a/system/core/liblog/logger_write.cpp
25+++ b/system/core/liblog/logger_write.cpp
26@@ -27,6 +27,7 @@
27 #include <android/set_abort_message.h>
28 #endif
29
30+#include <mutex>
31 #include <shared_mutex>
32
33 #include <android-base/errno_restorer.h>
34--- a/system/core/libziparchive/zip_archive_stream_entry.cc
35+++ b/system/core/libziparchive/zip_archive_stream_entry.cc
36@@ -23,6 +23,7 @@
37 #include <sys/types.h>
38 #include <unistd.h>
39
40+#include <limits>
41 #include <memory>
42 #include <vector>
43
44