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

Commit 07607c04 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Gerrit Code Review
Browse files

Merge changes I0c25e038,I33a8fb4e,I2c9cbbbd,If4c9711e,I4b00c0df, ... 

* changes:
  liblog: Move liblog tag from 1005 to 1006
  system/core Replace log/log.h with android/log.h
  system/core Replace cutils/log.h with android/log.h
  logd: logcat: Replace log/log.h with android/log.h
  libcutils: Replace cutils/log.h with android/log.h
  liblog: Replace log/log.h with android/log.h
  liblog: logcat: Replace log/logd.h with log/log.h
  liblog: logd: logcat: deprecate log/log_read.h
  liblog: Add C++ wrapper for C event log handler
parents e5976bea 9633b919

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"

adf/libadfhwc/adfhwc.cpp

+3 −3
Original line number Diff line number Diff line
@@ -20,12 +20,12 @@ 
#include <pthread.h>

#include <sys/resource.h>



#include <android/log.h>

#include <utils/Vector.h>



#include <adf/adf.h>

#include <adfhwc/adfhwc.h>



#include <cutils/log.h>

#include <utils/Vector.h>



struct adf_hwc_helper {

    adf_hwc_event_callbacks const *event_cb;

    void *event_cb_data;

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"