Fix some missing includes.
Newer versions of fmtlib no longer include <vector>, which
causes a build break in Cuttlefish. Add includes for std types
to fix this.
Bug: 280925579
Test: presubmit
Change-Id: Iddd7ee82ba4284a6cafd4c68e987f3ebaf48e8f1
diff --git a/common/libs/confui/packet.cpp b/common/libs/confui/packet.cpp
index fc2eedf..a951010 100644
--- a/common/libs/confui/packet.cpp
+++ b/common/libs/confui/packet.cpp
@@ -16,6 +16,10 @@
#include "common/libs/confui/packet.h"
#include <algorithm>
+#include <cstdint>
+#include <optional>
+#include <string>
+#include <vector>
namespace cuttlefish {
namespace confui {
diff --git a/common/libs/confui/protocol.h b/common/libs/confui/protocol.h
index f41afc4..53f7e70 100644
--- a/common/libs/confui/protocol.h
+++ b/common/libs/confui/protocol.h
@@ -16,9 +16,9 @@
#pragma once
#include <cstdint>
-#include <optional>
+#include <memory>
#include <string>
-#include <tuple>
+#include <vector>
#include <teeui/common_message_types.h> // /system/teeui/libteeui/.../include
diff --git a/common/libs/confui/protocol_types.cpp b/common/libs/confui/protocol_types.cpp
index e5b68e2..2ed2f00 100644
--- a/common/libs/confui/protocol_types.cpp
+++ b/common/libs/confui/protocol_types.cpp
@@ -15,9 +15,11 @@
#include "common/libs/confui/protocol_types.h"
+#include <cstdint>
#include <map>
#include <sstream>
#include <unordered_map>
+#include <vector>
#include "common/libs/confui/packet.h"
#include "common/libs/confui/utils.h"
diff --git a/common/libs/fs/epoll.cpp b/common/libs/fs/epoll.cpp
index 509d3df..d26ddc6 100644
--- a/common/libs/fs/epoll.cpp
+++ b/common/libs/fs/epoll.cpp
@@ -22,6 +22,7 @@
#include <optional>
#include <set>
#include <shared_mutex>
+#include <string>
#include "common/libs/fs/shared_fd.h"
#include "common/libs/utils/result.h"
diff --git a/common/libs/fs/shared_fd.h b/common/libs/fs/shared_fd.h
index 6277812..003d5a2 100644
--- a/common/libs/fs/shared_fd.h
+++ b/common/libs/fs/shared_fd.h
@@ -34,6 +34,8 @@
#include <memory>
#include <sstream>
+#include <string>
+#include <utility>
#include <vector>
#include <errno.h>
diff --git a/common/libs/security/confui_sign.cpp b/common/libs/security/confui_sign.cpp
index d643585..bae6b11 100644
--- a/common/libs/security/confui_sign.cpp
+++ b/common/libs/security/confui_sign.cpp
@@ -16,6 +16,10 @@
#include "common/libs/security/confui_sign.h"
+#include <cstdint>
+#include <optional>
+#include <vector>
+
#include <android-base/logging.h>
#include "common/libs/fs/shared_buf.h"
diff --git a/common/libs/utils/flag_parser.cpp b/common/libs/utils/flag_parser.cpp
index f22225b..31de26e 100644
--- a/common/libs/utils/flag_parser.cpp
+++ b/common/libs/utils/flag_parser.cpp
@@ -20,12 +20,15 @@
#include <cerrno>
#include <cstdlib>
#include <cstring>
+#include <functional>
#include <iostream>
+#include <string>
#include <string_view>
#include <type_traits>
#include <unordered_map>
#include <unordered_set>
#include <utility>
+#include <vector>
#include <android-base/logging.h>
#include <android-base/strings.h>
diff --git a/common/libs/utils/flags_validator.cpp b/common/libs/utils/flags_validator.cpp
index d7c5d01..efb5af9 100644
--- a/common/libs/utils/flags_validator.cpp
+++ b/common/libs/utils/flags_validator.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#include <string>
+
#include "common/libs/utils/flags_validator.h"
namespace cuttlefish {
diff --git a/common/libs/utils/inotify.h b/common/libs/utils/inotify.h
index 2808537..ba42f7e 100644
--- a/common/libs/utils/inotify.h
+++ b/common/libs/utils/inotify.h
@@ -15,6 +15,9 @@
*/
#pragma once
+#include <string>
+#include <vector>
+
namespace cuttlefish {
std::vector<std::string> GetCreatedFileListFromInotifyFd(int fd);
diff --git a/common/libs/utils/json.cpp b/common/libs/utils/json.cpp
index 13aabf4..bfacfd4 100644
--- a/common/libs/utils/json.cpp
+++ b/common/libs/utils/json.cpp
@@ -13,6 +13,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include <memory>
+#include <string_view>
+
#include "common/libs/utils/json.h"
namespace cuttlefish {
diff --git a/common/libs/utils/proc_file_utils.cpp b/common/libs/utils/proc_file_utils.cpp
index 83171af..e0bb266 100644
--- a/common/libs/utils/proc_file_utils.cpp
+++ b/common/libs/utils/proc_file_utils.cpp
@@ -20,6 +20,9 @@
#include <regex>
#include <sstream>
+#include <string>
+#include <unordered_map>
+#include <vector>
#include <android-base/file.h>
#include <android-base/parseint.h>
diff --git a/common/libs/utils/result.h b/common/libs/utils/result.h
index 531589a..11a6007 100644
--- a/common/libs/utils/result.h
+++ b/common/libs/utils/result.h
@@ -16,7 +16,12 @@
#pragma once
#include <optional>
+#include <ostream>
+#include <sstream>
+#include <string>
#include <type_traits>
+#include <utility>
+#include <vector>
#include <android-base/logging.h>
#include <android-base/result.h> // IWYU pragma: export
diff --git a/common/libs/utils/result_test.cpp b/common/libs/utils/result_test.cpp
index 7212e9c..2024212 100644
--- a/common/libs/utils/result_test.cpp
+++ b/common/libs/utils/result_test.cpp
@@ -16,6 +16,7 @@
#include "common/libs/utils/result.h"
+#include <string>
#include <type_traits>
#include <android-base/expected.h>
diff --git a/common/libs/utils/socket2socket_proxy.cpp b/common/libs/utils/socket2socket_proxy.cpp
index b55c215..a465e43 100644
--- a/common/libs/utils/socket2socket_proxy.cpp
+++ b/common/libs/utils/socket2socket_proxy.cpp
@@ -22,9 +22,10 @@
#include <cstring>
#include <functional>
#include <memory>
-#include <ostream>
#include <string>
#include <thread>
+#include <utility>
+#include <vector>
#include <android-base/logging.h>
diff --git a/common/libs/utils/unique_resource_allocator_test.cpp b/common/libs/utils/unique_resource_allocator_test.cpp
index 352c5ab..88ab2a9 100644
--- a/common/libs/utils/unique_resource_allocator_test.cpp
+++ b/common/libs/utils/unique_resource_allocator_test.cpp
@@ -14,6 +14,7 @@
// limitations under the License.
#include <unordered_set>
+#include <vector>
#include "common/libs/utils/contains.h"
#include "common/libs/utils/unique_resource_allocator.h"
diff --git a/common/libs/utils/unix_sockets_test.cpp b/common/libs/utils/unix_sockets_test.cpp
index 245747f..e063700 100644
--- a/common/libs/utils/unix_sockets_test.cpp
+++ b/common/libs/utils/unix_sockets_test.cpp
@@ -16,6 +16,9 @@
#include "common/libs/utils/unix_sockets.h"
+#include <string>
+#include <utility>
+
#include <android-base/logging.h>
#include <android-base/result.h>
#include <gtest/gtest.h>
diff --git a/host/libs/audio_connector/commands.cpp b/host/libs/audio_connector/commands.cpp
index b77c726..4f150a3 100644
--- a/host/libs/audio_connector/commands.cpp
+++ b/host/libs/audio_connector/commands.cpp
@@ -16,6 +16,8 @@
#include "host/libs/audio_connector/commands.h"
#include <algorithm>
+#include <cstdint>
+#include <vector>
#include <android-base/logging.h>
diff --git a/tests/hal/hal_implementation_test.cpp b/tests/hal/hal_implementation_test.cpp
index 0ae8a8d..ecc9a5c 100644
--- a/tests/hal/hal_implementation_test.cpp
+++ b/tests/hal/hal_implementation_test.cpp
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
#include <aidl/metadata.h>
#include <android-base/logging.h>
#include <android-base/properties.h>
@@ -24,6 +25,14 @@
#include <hidl/metadata.h>
#include <vintf/VintfObject.h>
+#include <algorithm>
+#include <cstddef>
+#include <map>
+#include <mutex>
+#include <set>
+#include <string>
+#include <vector>
+
using namespace android;
// clang-format off
