| commit | c86f5da7062cb1dd1869582b4fc648fff5be48aa | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Sep 22 04:35:15 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 22 04:35:15 2023 +0000 |
| tree | 3b095372f4c9010c2ad82574496af70d32b96ad1 | |
| parent | 1c4fa8d841b9d35885e6d20e1be845b0ff4d5020 [diff] | |
| parent | 1b0f6fe05830ddb4db4ee7b5001db009e9cd3e07 [diff] |
Merge "use different log.h header file" into main am: 1b0f6fe058 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2759769 Change-Id: I971112a143a574d593d7a2a63b1926d448b0eeac 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 847083e..3be7067 100644 --- a/staticlibs/native/bpf_headers/include/bpf/BpfMap.h +++ b/staticlibs/native/bpf_headers/include/bpf/BpfMap.h
@@ -18,10 +18,10 @@ #include <linux/bpf.h> +#include <android/log.h> #include <android-base/result.h> #include <android-base/stringprintf.h> #include <android-base/unique_fd.h> -#include <utils/Log.h> #include "BpfSyscallWrappers.h" #include "bpf/BpfUtils.h"