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

Commit cfd5b080 authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

system/core: preparation to pull back interfaces from android/log.h

Point to log/log.h where necessary, define LOG_TAG where necessary.
Accept that private/android_logger.h is suitable replacement for
log/logger.h and android/log.h.

Correct liblog/README

Effectively a cleanup and controlled select revert of
'system/core: drop or replace log/logger.h' and
'system/core: Replace log/log.h with android/log.h'.

Test: compile
Bug: 30465923
Change-Id: Ic2ad157bad6f5efe2c6af293a73bb753300b17a2
parent 1edd61ce
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@

// Headers for LogMessage::LogLine.
#ifdef __ANDROID__
#include <android/log.h>
#include <log/log.h>
#include <android/set_abort_message.h>
#else
#include <sys/types.h>
+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@
#include <memory>
#include <string>

#include <android/log.h>
#include <log/log.h>
#include <android-base/logging.h>

namespace {
+1 −1
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@

#include <inttypes.h>

#include <android/log.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include <log/log.h>

using testing::ElementsAreArray;

+1 −1
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@
#include <cstdlib>
#include <memory>

#include <android/log.h>
#include <android-base/logging.h>
#include <log/log.h>

#include "event_log_list_builder.h"

+18 −0
Original line number Diff line number Diff line
/*
 * Copyright 2006, The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

#define LOG_TAG "crasher"

#include <assert.h>
#include <errno.h>
#include <fcntl.h>
Loading