Merge "bootstat: Fix the base includes to be AOSP-friendly."
am: d320cbf5ba
* commit 'd320cbf5ba1b4490700f2ff89af29f28a2e326e3':
bootstat: Fix the base includes to be AOSP-friendly.
diff --git a/bootstat/boot_event_record_store.cpp b/bootstat/boot_event_record_store.cpp
index 0133f5b..4dab92e 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 efe1e43..77978ef 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 56af0a6..90874f5 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 a4cbf4e..a83f8ad 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 017a7c5..7eb355a 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 52d623f..4e29b01 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 ff8611e..79b61d1 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) {