commit 5f35d9993f677a539646b0cafe1e7494ed435d50
author Treehugger Robot <treehugger-gerrit@google.com> Fri Oct 19 09:25:25 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 19 09:25:25 2018 +0000
tree c041907f4e012d2385c9d4ddd95dac8163f8b319
parent 46662c8d38b244ed9bca35e71e5fd4278af99068
parent 26ffded7e29db01560112c5398db47d6675e96b3

Merge "Add missing #include for ALOGx() macros"

libbpf/BpfUtils.cpp

diff --git a/libbpf/BpfUtils.cpp b/libbpf/BpfUtils.cpp
index cec8911..4d4cae3 100644
--- a/libbpf/BpfUtils.cpp
+++ b/libbpf/BpfUtils.cpp
@@ -16,6 +16,8 @@
 
 #define LOG_TAG "BpfUtils"
 
+#include "bpf/BpfUtils.h"
+
 #include <elf.h>
 #include <inttypes.h>
 #include <linux/bpf.h>
@@ -31,20 +33,16 @@
 #include <string>
 
 #include <android-base/properties.h>
-#include <android-base/stringprintf.h>
 #include <android-base/unique_fd.h>
+#include <log/log.h>
 #include <netdutils/MemBlock.h>
 #include <netdutils/Slice.h>
-#include <netdutils/StatusOr.h>
-#include "bpf/BpfUtils.h"
 
 using android::base::GetUintProperty;
-using android::base::StringPrintf;
 using android::base::unique_fd;
 using android::netdutils::MemBlock;
 using android::netdutils::Slice;
 using android::netdutils::statusFromErrno;
-using android::netdutils::StatusOr;
 
 constexpr size_t LOG_BUF_SIZE = 65536;