From eabe08b55eb7a8eceda02d302cea4d4f216e0d53 Mon Sep 17 00:00:00 2001
From: James Hawkins <jhawkins@google.com>
Date: Tue, 19 Jan 2016 16:54:35 -0800
Subject: [PATCH] bootstat: Fix the base includes to be AOSP-friendly.

Change-Id: I625cc55b41f5258addf3bb74bcef42063c565465
Bug: 21724738
---
 bootstat/boot_event_record_store.cpp      | 4 ++--
 bootstat/boot_event_record_store.h        | 2 +-
 bootstat/boot_event_record_store_test.cpp | 4 ++--
 bootstat/bootstat.cpp                     | 2 +-
 bootstat/event_log_list_builder.cpp       | 2 +-
 bootstat/event_log_list_builder.h         | 2 +-
 bootstat/testrunner.cpp                   | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bootstat/boot_event_record_store.cpp b/bootstat/boot_event_record_store.cpp
index 0133f5b26..4dab92e93 100644
--- a/bootstat/boot_event_record_store.cpp
+++ b/bootstat/boot_event_record_store.cpp
@@ -21,8 +21,8 @@
 #include <sys/stat.h>
 #include <utime.h>
 #include <cstdlib>
-#include <base/file.h>
-#include <base/logging.h>
+#include <android-base/file.h>
+#include <android-base/logging.h>
 
 namespace {
 
diff --git a/bootstat/boot_event_record_store.h b/bootstat/boot_event_record_store.h
index efe1e43d1..77978eff7 100644
--- a/bootstat/boot_event_record_store.h
+++ b/bootstat/boot_event_record_store.h
@@ -21,7 +21,7 @@
 #include <string>
 #include <utility>
 #include <vector>
-#include <base/macros.h>
+#include <android-base/macros.h>
 #include <gtest/gtest_prod.h>
 
 // BootEventRecordStore manages the persistence of boot events to the record
diff --git a/bootstat/boot_event_record_store_test.cpp b/bootstat/boot_event_record_store_test.cpp
index 56af0a62e..90874f50a 100644
--- a/bootstat/boot_event_record_store_test.cpp
+++ b/bootstat/boot_event_record_store_test.cpp
@@ -21,8 +21,8 @@
 #include <unistd.h>
 #include <cstdint>
 #include <cstdlib>
-#include <base/file.h>
-#include <base/test_utils.h>
+#include <android-base/file.h>
+#include <android-base/test_utils.h>
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
diff --git a/bootstat/bootstat.cpp b/bootstat/bootstat.cpp
index a4cbf4e83..a83f8ad0d 100644
--- a/bootstat/bootstat.cpp
+++ b/bootstat/bootstat.cpp
@@ -25,7 +25,7 @@
 #include <cstdio>
 #include <memory>
 #include <string>
-#include <base/logging.h>
+#include <android-base/logging.h>
 #include <log/log.h>
 #include "boot_event_record_store.h"
 #include "event_log_list_builder.h"
diff --git a/bootstat/event_log_list_builder.cpp b/bootstat/event_log_list_builder.cpp
index 017a7c529..7eb355a82 100644
--- a/bootstat/event_log_list_builder.cpp
+++ b/bootstat/event_log_list_builder.cpp
@@ -18,7 +18,7 @@
 
 #include <cinttypes>
 #include <string>
-#include <base/logging.h>
+#include <android-base/logging.h>
 #include <log/log.h>
 
 namespace {
diff --git a/bootstat/event_log_list_builder.h b/bootstat/event_log_list_builder.h
index 52d623f4d..4e29b01ec 100644
--- a/bootstat/event_log_list_builder.h
+++ b/bootstat/event_log_list_builder.h
@@ -20,7 +20,7 @@
 #include <cstdint>
 #include <memory>
 
-#include <base/macros.h>
+#include <android-base/macros.h>
 
 // EventLogListBuilder provides a mechanism to build an EventLog list
 // consisting of int and string EventLog values.
diff --git a/bootstat/testrunner.cpp b/bootstat/testrunner.cpp
index ff8611ede..79b61d13b 100644
--- a/bootstat/testrunner.cpp
+++ b/bootstat/testrunner.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <base/logging.h>
+#include <android-base/logging.h>
 #include <gtest/gtest.h>
 
 int main(int argc, char** argv) {