Merge "Minor changes to netlink code."

[android-x86/system-extras.git] / simpleperf / event_type.cpp

diff --git a/simpleperf/event_type.cpp b/simpleperf/event_type.cpp
index 1d0243c..ddec6f9 100644 (file)
--- a/simpleperf/event_type.cpp
+++ b/simpleperf/event_type.cpp
@@ -21,16 +21,14 @@
 #include <string>
 #include <vector>
 
-#include <base/file.h>
-#include <base/logging.h>
+#include <android-base/file.h>
+#include <android-base/logging.h>
 
 #include "event_attr.h"
 #include "event_fd.h"
 #include "utils.h"
 
-#define EVENT_TYPE_TABLE_ENTRY(name, type, config) \
-  { name, type, config }                           \
-  ,
+#define EVENT_TYPE_TABLE_ENTRY(name, type, config) {name, type, config},
 
 static const std::vector<EventType> static_event_type_array = {
 #include "event_type_table.h"