Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d320cbf5 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

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

parents 195bbc71 eabe08b5

bootstat/boot_event_record_store.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


#include <cinttypes>

#include <string>

#include <base/logging.h>

#include <android-base/logging.h>

#include <log/log.h>



namespace {