| commit | 5d9c92eca4f0afded1b4dca8ee4ecf2c84286aaa | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Sep 22 05:33:48 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 22 05:33:48 2023 +0000 |
| tree | dd2abf62faf6082d29ffe33d5b539b82d77296cf | |
| parent | 9212632fb29b096b5a6a2f13ce3d4c88a6b0bcb1 [diff] | |
| parent | a75b433c180db6d2916a41b95700a76bad6236cb [diff] |
Merge "use different log.h header file" into main am: 1b0f6fe058 am: a75b433c18 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2759769 Change-Id: I9e043ebd13b74638fa35b03f9562ed2750c91a49 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"