Merge "system/core: preparation to pull back interfaces from android/log.h" (27d2d49f) · Commits · e / os / android_system_core

base/logging.cpp

+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>