| commit | dc7481d3b00a1a177b18728752c113c8d1473cfc | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Jan 09 22:17:10 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 09 22:17:10 2024 +0000 |
| tree | 4cdd1c8c7c1903a1a024e1087d9539fc4250221e | |
| parent | ecee1fe07f906fa82a1a8d655814d42bf16a4743 [diff] | |
| parent | 7369397cad0fe6c4a4cbcfb7129dc90d7e5befe0 [diff] |
Merge "Add missing libc++ includes" into main am: 7297906e49 am: 7369397cad Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2902172 Change-Id: I5a70ad9fc2d28c6e8e66f6b714b76313e0e00de4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/automotive/can/1.0/default/CanSocket.h b/automotive/can/1.0/default/CanSocket.h index fd956b5..f3e8e60 100644 --- a/automotive/can/1.0/default/CanSocket.h +++ b/automotive/can/1.0/default/CanSocket.h
@@ -22,6 +22,7 @@ #include <atomic> #include <chrono> +#include <functional> #include <thread> namespace android::hardware::automotive::can::V1_0::implementation {
diff --git a/automotive/can/1.0/default/libnetdevice/ifreqs.h b/automotive/can/1.0/default/libnetdevice/ifreqs.h index d8d6fe0..aa7030b 100644 --- a/automotive/can/1.0/default/libnetdevice/ifreqs.h +++ b/automotive/can/1.0/default/libnetdevice/ifreqs.h
@@ -18,6 +18,7 @@ #include <net/if.h> +#include <atomic> #include <string> namespace android::netdevice::ifreqs {
diff --git a/automotive/can/1.0/default/libnetdevice/libnetdevice.cpp b/automotive/can/1.0/default/libnetdevice/libnetdevice.cpp index fe749f6..413b4b1 100644 --- a/automotive/can/1.0/default/libnetdevice/libnetdevice.cpp +++ b/automotive/can/1.0/default/libnetdevice/libnetdevice.cpp
@@ -27,6 +27,8 @@ #include <linux/rtnetlink.h> #include <net/if.h> +#include <algorithm> +#include <iterator> #include <sstream> namespace android::netdevice {
diff --git a/automotive/can/1.0/default/libnl++/common.cpp b/automotive/can/1.0/default/libnl++/common.cpp index 23c2d94..1287bb5 100644 --- a/automotive/can/1.0/default/libnl++/common.cpp +++ b/automotive/can/1.0/default/libnl++/common.cpp
@@ -20,6 +20,8 @@ #include <net/if.h> +#include <algorithm> + namespace android::nl { unsigned int nametoindex(const std::string& ifname) {