| commit | 43609acf243034e1be5d84704c7f7e1e2d77b2cb | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Jan 09 22:11:10 2024 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Jan 09 22:11:10 2024 +0000 |
| tree | 33b531a0d3d855d0437405ae9492d3fd5856e7ab | |
| parent | 7297906e49c397df64cf365397d75054fc798e75 [diff] | |
| parent | 93f1bf2bd357b709317ed08784727f405c7e71da [diff] |
Merge "Per NCI spec there is no need to wait for credits" into main
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) {