| commit | 677119874e02af2237711486bb84b85f43f75540 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed May 17 20:41:50 2023 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed May 17 20:41:50 2023 +0000 |
| tree | 95dea029f0ced20b46552b002e4967d40b2b0768 | |
| parent | a60ccc7c6ea67b3842bd14bab52a86cb2a15b476 [diff] | |
| parent | 66452f566b54a4c5243892332b3e02de62f373e5 [diff] |
Merge "bpf_headers: rename KernelVersion.h to KernelUtils.h"
diff --git a/staticlibs/native/bpf_headers/include/bpf/BpfUtils.h b/staticlibs/native/bpf_headers/include/bpf/BpfUtils.h index 99c7a91..9dd5822 100644 --- a/staticlibs/native/bpf_headers/include/bpf/BpfUtils.h +++ b/staticlibs/native/bpf_headers/include/bpf/BpfUtils.h
@@ -28,7 +28,7 @@ #include <log/log.h> -#include "KernelVersion.h" +#include "KernelUtils.h" namespace android { namespace bpf {
diff --git a/staticlibs/native/bpf_headers/include/bpf/KernelVersion.h b/staticlibs/native/bpf_headers/include/bpf/KernelUtils.h similarity index 100% rename from staticlibs/native/bpf_headers/include/bpf/KernelVersion.h rename to staticlibs/native/bpf_headers/include/bpf/KernelUtils.h
diff --git a/staticlibs/native/bpfmapjni/com_android_net_module_util_BpfMap.cpp b/staticlibs/native/bpfmapjni/com_android_net_module_util_BpfMap.cpp index 2146d17..f93d6e1 100644 --- a/staticlibs/native/bpfmapjni/com_android_net_module_util_BpfMap.cpp +++ b/staticlibs/native/bpfmapjni/com_android_net_module_util_BpfMap.cpp
@@ -25,7 +25,7 @@ #define BPF_FD_JUST_USE_INT #include "BpfSyscallWrappers.h" -#include "bpf/KernelVersion.h" +#include "bpf/KernelUtils.h" namespace android {
diff --git a/staticlibs/native/tcutils/tcutils.cpp b/staticlibs/native/tcutils/tcutils.cpp index 37a7ec8..c82390f 100644 --- a/staticlibs/native/tcutils/tcutils.cpp +++ b/staticlibs/native/tcutils/tcutils.cpp
@@ -19,7 +19,7 @@ #include "tcutils/tcutils.h" #include "logging.h" -#include "bpf/KernelVersion.h" +#include "bpf/KernelUtils.h" #include "scopeguard.h" #include <arpa/inet.h>
diff --git a/staticlibs/native/tcutils/tests/tcutils_test.cpp b/staticlibs/native/tcutils/tests/tcutils_test.cpp index 53835d7..7732247 100644 --- a/staticlibs/native/tcutils/tests/tcutils_test.cpp +++ b/staticlibs/native/tcutils/tests/tcutils_test.cpp
@@ -18,7 +18,7 @@ #include <gtest/gtest.h> -#include "bpf/KernelVersion.h" +#include "bpf/KernelUtils.h" #include <tcutils/tcutils.h> #include <BpfSyscallWrappers.h>