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

Commit cac331af authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

system/core Replace log/log.h with android/log.h 

am: ff2dcd9a

Change-Id: I3c47cb42639d56740ecf7e4fe61ea49982d69fed
parents eb189f14 ff2dcd9a

adb/file_sync_service.cpp

+6 −6
Original line number Diff line number Diff line
@@ -31,17 +31,17 @@ 
#include <unistd.h>

#include <utime.h>



#include <android/log.h>

#include <android-base/stringprintf.h>

#include <android-base/strings.h>

#include <private/android_filesystem_config.h>

#include <selinux/android.h>



#include "adb.h"

#include "adb_io.h"

#include "adb_utils.h"

#include "private/android_filesystem_config.h"

#include "security_log_tags.h"



#include <android-base/stringprintf.h>

#include <android-base/strings.h>

#include <log/log.h>

#include <selinux/android.h>



static bool should_use_fs_config(const std::string& path) {

    // TODO: use fs_config to configure permissions on /data.

    return android::base::StartsWith(path, "/system/") ||

adb/shell_service.cpp

+1 −1
Original line number Diff line number Diff line
@@ -92,10 +92,10 @@ 
#include <unordered_map>

#include <vector>



#include <android/log.h>

#include <android-base/logging.h>

#include <android-base/stringprintf.h>

#include <paths.h>

#include <log/log.h>



#include "adb.h"

#include "adb_io.h"

base/logging.cpp

+4 −4
Original line number Diff line number Diff line
@@ -43,18 +43,18 @@ 
#include <utility>

#include <vector>



#include "android-base/macros.h"

#include "android-base/strings.h"



// Headers for LogMessage::LogLine.

#ifdef __ANDROID__

#include <android/log.h>

#include <android/set_abort_message.h>

#include "log/log.h"

#else

#include <sys/types.h>

#include <unistd.h>

#endif



#include <android-base/macros.h>

#include <android-base/strings.h>



// For gettid.

#if defined(__APPLE__)

#include "AvailabilityMacros.h"  // For MAC_OS_X_VERSION_MAX_ALLOWED

bootstat/bootstat.cpp

+5 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


#include <getopt.h>

#include <unistd.h>



#include <cmath>

#include <cstddef>

#include <cstdio>
@@ -27,12 +28,14 @@ 
#include <map>

#include <memory>

#include <string>



#include <android/log.h>

#include <android-base/logging.h>

#include <android-base/parseint.h>

#include <cutils/properties.h>

#include <log/log.h>



#include "boot_event_record_store.h"

#include "event_log_list_builder.h"

#include "event_log_list_builder.h" /* ToDo: switch to liblog implementation */

#include "histogram_logger.h"

#include "uptime_parser.h"

bootstat/event_log_list_builder.cpp

+2 −1
Original line number Diff line number Diff line
@@ -19,8 +19,9 @@ 
#include <cinttypes>

#include <memory>

#include <string>



#include <android/log.h>

#include <android-base/logging.h>

#include <log/log.h>



namespace {