commit 1b0f6fe05830ddb4db4ee7b5001db009e9cd3e07
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Sep 22 04:11:47 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 22 04:11:47 2023 +0000
tree da3c5f3c160f385cd40e5e32a0dd48cbc70adab3
parent 487191dbe6f26740f52d0198d41a73bb4989916b
parent 601d9f8b65e897495ec8685971c449a401ab0f65

Merge "use different log.h header file" into main

staticlibs/native/bpf_headers/include/bpf/BpfMap.h

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"