| commit | 6d0996391570e10a9dd4815eb45275d3f8447414 | [log] [tgz] |
|---|---|---|
| author | Tomasz Wasilczyk <twasilczyk@google.com> | Fri Jan 12 04:29:12 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 12 04:29:12 2024 +0000 |
| tree | c401209b45320604f9c1b70e62183e9ed54a48cf | |
| parent | 1e89a338bb0758ea4150c895220d4def596dc15d [diff] | |
| parent | 9fbee3de33e12743db5ea03a5d6b166b52f96301 [diff] |
Merge "Add missing libc++ includes" into main am: 9fbee3de33 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2902129 Change-Id: I44d04123b6072bc37daffda6f57c81ef76ca0159 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/staticlibs/native/bpf_headers/include/bpf/BpfMap.h b/staticlibs/native/bpf_headers/include/bpf/BpfMap.h index 3fede3c..1037beb 100644 --- a/staticlibs/native/bpf_headers/include/bpf/BpfMap.h +++ b/staticlibs/native/bpf_headers/include/bpf/BpfMap.h
@@ -26,6 +26,8 @@ #include "BpfSyscallWrappers.h" #include "bpf/BpfUtils.h" +#include <functional> + namespace android { namespace bpf {
diff --git a/staticlibs/netd/libnetdutils/include/netdutils/InternetAddresses.h b/staticlibs/netd/libnetdutils/include/netdutils/InternetAddresses.h index d10cec7..d662739 100644 --- a/staticlibs/netd/libnetdutils/include/netdutils/InternetAddresses.h +++ b/staticlibs/netd/libnetdutils/include/netdutils/InternetAddresses.h
@@ -21,6 +21,7 @@ #include <stdint.h> #include <cstring> #include <limits> +#include <memory> #include <string> #include "netdutils/NetworkConstants.h"
diff --git a/staticlibs/netd/libnetdutils/include/netdutils/Log.h b/staticlibs/netd/libnetdutils/include/netdutils/Log.h index 77ae649..d266cbc 100644 --- a/staticlibs/netd/libnetdutils/include/netdutils/Log.h +++ b/staticlibs/netd/libnetdutils/include/netdutils/Log.h
@@ -19,6 +19,7 @@ #include <chrono> #include <deque> +#include <functional> #include <shared_mutex> #include <string> #include <type_traits>
diff --git a/staticlibs/netd/libnetdutils/include/netdutils/Slice.h b/staticlibs/netd/libnetdutils/include/netdutils/Slice.h index 717fbd1..aa12927 100644 --- a/staticlibs/netd/libnetdutils/include/netdutils/Slice.h +++ b/staticlibs/netd/libnetdutils/include/netdutils/Slice.h
@@ -22,6 +22,7 @@ #include <cstring> #include <ostream> #include <tuple> +#include <type_traits> #include <vector> namespace android {