| commit | c57c633699cbea73ac105f418739cfaa2e0ccac0 | [log] [tgz] |
|---|---|---|
| author | Tomasz Wasilczyk <twasilczyk@google.com> | Fri Jan 12 05:35:17 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 12 05:35:17 2024 +0000 |
| tree | 5d5b610338ff7b01adfbf72ee5c76e3dc3a97f68 | |
| parent | 610cdb81e9fb62230e7553928af0a75380833fe5 [diff] | |
| parent | 5f48c4951d6262bb063f449ef58f1ca290ce298d [diff] |
Merge "Add missing libc++ includes" into main am: 9fbee3de33 am: 5f48c4951d Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2902129 Change-Id: I2212dae024d152a4ec78c7e80948651cbe107053 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 {