summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hao Chen <chenhaosjtuacm@google.com> 2023-05-31 14:12:33 -0700
committer Tomasz Wasilczyk <twasilczyk@google.com> 2023-10-05 17:17:04 +0000
commitf1c4777d018d33c7d6e0544dcc4578695c2773c1 (patch)
tree0e09477f378efacaaebacca2d29df7e65ef7f7aa
parentfe0c71f1e24fd3bbc4624af5fced28e7fbeff322 (diff)
Add missing headers when Building with libstdc++
Test: Build with CMake. See aosp/2629369. Bug: 285204695 Change-Id: Ife316aa5c08ea0f365f52062cff52625ca877c46
-rw-r--r--libs/binder/RpcTlsUtils.cpp2
-rw-r--r--libs/binder/include/binder/BpBinder.h1
-rw-r--r--libs/binder/include/binder/Parcel.h2
-rw-r--r--libs/binder/include/binder/RpcServer.h1
-rw-r--r--libs/binder/include/binder/RpcThreads.h1
-rw-r--r--libs/binder/ndk/include_cpp/android/binder_auto_utils.h1
6 files changed, 8 insertions, 0 deletions
diff --git a/libs/binder/RpcTlsUtils.cpp b/libs/binder/RpcTlsUtils.cpp
index f3ca02a3bd..d5c86d7227 100644
--- a/libs/binder/RpcTlsUtils.cpp
+++ b/libs/binder/RpcTlsUtils.cpp
@@ -21,6 +21,8 @@
#include "Utils.h"
+#include <limits>
+
namespace android {
namespace {
diff --git a/libs/binder/include/binder/BpBinder.h b/libs/binder/include/binder/BpBinder.h
index 5496d61b70..fc8089d069 100644
--- a/libs/binder/include/binder/BpBinder.h
+++ b/libs/binder/include/binder/BpBinder.h
@@ -21,6 +21,7 @@
#include <utils/Mutex.h>
#include <map>
+#include <optional>
#include <unordered_map>
#include <variant>
diff --git a/libs/binder/include/binder/Parcel.h b/libs/binder/include/binder/Parcel.h
index 4e231edac5..45e5ace73c 100644
--- a/libs/binder/include/binder/Parcel.h
+++ b/libs/binder/include/binder/Parcel.h
@@ -17,7 +17,9 @@
#pragma once
#include <array>
+#include <limits>
#include <map> // for legacy reasons
+#include <optional>
#include <string>
#include <type_traits>
#include <variant>
diff --git a/libs/binder/include/binder/RpcServer.h b/libs/binder/include/binder/RpcServer.h
index b804f7b92a..2153f162e5 100644
--- a/libs/binder/include/binder/RpcServer.h
+++ b/libs/binder/include/binder/RpcServer.h
@@ -23,6 +23,7 @@
#include <utils/Errors.h>
#include <utils/RefBase.h>
+#include <bitset>
#include <mutex>
#include <thread>
diff --git a/libs/binder/include/binder/RpcThreads.h b/libs/binder/include/binder/RpcThreads.h
index 8abf04eaf0..b80d116e1c 100644
--- a/libs/binder/include/binder/RpcThreads.h
+++ b/libs/binder/include/binder/RpcThreads.h
@@ -19,6 +19,7 @@
#include <android-base/threads.h>
+#include <condition_variable>
#include <functional>
#include <memory>
#include <thread>
diff --git a/libs/binder/ndk/include_cpp/android/binder_auto_utils.h b/libs/binder/ndk/include_cpp/android/binder_auto_utils.h
index ed53891e3d..18769b1454 100644
--- a/libs/binder/ndk/include_cpp/android/binder_auto_utils.h
+++ b/libs/binder/ndk/include_cpp/android/binder_auto_utils.h
@@ -31,6 +31,7 @@
#include <android/binder_parcel.h>
#include <android/binder_status.h>
#include <assert.h>
+#include <string.h>
#include <unistd.h>
#include <cstddef>