| commit | 2deea071d166a48e724ab9f55564f3ea726666fd | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue May 23 09:09:37 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 23 09:09:37 2023 +0000 |
| tree | a06c506dc36dcde9e04e8b1c6c6eff3e43b98a2d | |
| parent | d4bc0701fc2a3aa630aec6e2fdd16e4a53377ac0 [diff] | |
| parent | 3b71da66034185d68e4889642280d441ca951763 [diff] |
Merge "bpf_headers: rename KernelVersion.h to KernelUtils.h" into udc-dev am: 3b71da6603 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/net/+/23368634 Change-Id: I5f43ffe10e70495a9e87bcee4797cb88bcb82dc8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/common/native/bpf_headers/include/bpf/BpfUtils.h b/common/native/bpf_headers/include/bpf/BpfUtils.h index 99c7a91..9dd5822 100644 --- a/common/native/bpf_headers/include/bpf/BpfUtils.h +++ b/common/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/common/native/bpf_headers/include/bpf/KernelVersion.h b/common/native/bpf_headers/include/bpf/KernelUtils.h similarity index 100% rename from common/native/bpf_headers/include/bpf/KernelVersion.h rename to common/native/bpf_headers/include/bpf/KernelUtils.h
diff --git a/common/native/bpfmapjni/com_android_net_module_util_BpfMap.cpp b/common/native/bpfmapjni/com_android_net_module_util_BpfMap.cpp index 2146d17..f93d6e1 100644 --- a/common/native/bpfmapjni/com_android_net_module_util_BpfMap.cpp +++ b/common/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/common/native/tcutils/tcutils.cpp b/common/native/tcutils/tcutils.cpp index 37a7ec8..c82390f 100644 --- a/common/native/tcutils/tcutils.cpp +++ b/common/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/common/native/tcutils/tests/tcutils_test.cpp b/common/native/tcutils/tests/tcutils_test.cpp index 53835d7..7732247 100644 --- a/common/native/tcutils/tests/tcutils_test.cpp +++ b/common/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>