Merge "liblog: deprecate export of LOGGER_LOG_* defines" (24239a99) · Commits · e / os / android_system_core

include/log/logger.h

+1 −6

Original line number	Diff line number	Diff line
		/*
		**
		** Copyright 2007, The Android Open Source Project
		** Copyright 2007-2014, The Android Open Source Project
		**
		** This file is dual licensed. It may be redistributed and/or modified
		** under the terms of the Apache 2.0 License OR version 2 of the GNU
		@@ -48,11 +48,6 @@ struct logger_entry_v2 {
		char msg[0]; /* the entry's payload */
		};

		#define LOGGER_LOG_MAIN "log/main"
		#define LOGGER_LOG_RADIO "log/radio"
		#define LOGGER_LOG_EVENTS "log/events"
		#define LOGGER_LOG_SYSTEM "log/system"

		/*
		* The maximum size of the log entry payload that can be
		* written to the kernel logger driver. An attempt to write

+6 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2007 The Android Open Source Project
		* Copyright (C) 2007-2014 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.
		@@ -31,6 +31,11 @@
		#include <log/logd.h>
		#include <log/log.h>

		#define LOGGER_LOG_MAIN "log/main"
		#define LOGGER_LOG_RADIO "log/radio"
		#define LOGGER_LOG_EVENTS "log/events"
		#define LOGGER_LOG_SYSTEM "log/system"

		#define LOG_BUF_SIZE 1024

		#if FAKE_LOG_DEVICE