Merge "bootstat: Fix the base includes to be AOSP-friendly."

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 {
 

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

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>
 

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"

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 {

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.

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) {