Revert "Continue using the legacy NDK android/log.h." (bdac221c) · Commits · e / os / android_system_core

include/android

deleted120000 → 0

+0 −1

Original line number	Original line	Diff line number	Diff line
	../liblog/include/android
	No newline at end of file

include/android/log.h

0 → 120000

+1 −0

Original line number	Original line	Diff line number	Diff line
			../../liblog/include/android/log.h
			No newline at end of file

liblog/Android.bp

+2 −10

Original line number	Original line	Diff line number	Diff line
	@@ -97,19 +97,11 @@ cc_library {
	compile_multilib: "both",		compile_multilib: "both",
	}		}

	// system/core/android/log.h needs some work before it can be included in the
	// NDK. It defines a lot of macros that previously were usable names in NDK
	// sources that used android/log.h. As an example, the following file defines
	// LOG_TAG as a variable, but the variable name gets macro replaced if we use
	// the current android/log.h.
	// https://android.googlesource.com/platform/external/deqp/+/4adc1515f867b26c19c2f7498e9de93a230a234d/framework/platform/android/tcuTestLogParserJNI.cpp#41
	//
	// For now, we keep a copy of the old NDK android/log.h in legacy-ndk-includes.
	ndk_headers {		ndk_headers {
	name: "liblog_headers",		name: "liblog_headers",
	from: "legacy-ndk-includes",		from: "include/android",
	to: "android",		to: "android",
	srcs: ["legacy-ndk-includes/log.h"],		srcs: ["include/android/log.h"],
	license: "NOTICE",		license: "NOTICE",
	}		}

liblog/legacy-ndk-includes/log.h

deleted100644 → 0

+0 −128

Original line number	Original line	Diff line number	Diff line
	/*
	* Copyright (C) 2009 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.
	*/

	#ifndef _ANDROID_LOG_H
	#define _ANDROID_LOG_H

	/******************************************************************
	*
	* IMPORTANT NOTICE:
	*
	* This file is part of Android's set of stable system headers
	* exposed by the Android NDK (Native Development Kit) since
	* platform release 1.5
	*
	* Third-party source AND binary code relies on the definitions
	* here to be FROZEN ON ALL UPCOMING PLATFORM RELEASES.
	*
	* - DO NOT MODIFY ENUMS (EXCEPT IF YOU ADD NEW 32-BIT VALUES)
	* - DO NOT MODIFY CONSTANTS OR FUNCTIONAL MACROS
	* - DO NOT CHANGE THE SIGNATURE OF FUNCTIONS IN ANY WAY
	* - DO NOT CHANGE THE LAYOUT OR SIZE OF STRUCTURES
	*/

	/*
	* Support routines to send messages to the Android in-kernel log buffer,
	* which can later be accessed through the 'logcat' utility.
	*
	* Each log message must have
	* - a priority
	* - a log tag
	* - some text
	*
	* The tag normally corresponds to the component that emits the log message,
	* and should be reasonably small.
	*
	* Log message text may be truncated to less than an implementation-specific
	* limit (e.g. 1023 characters max).
	*
	* Note that a newline character ("\n") will be appended automatically to your
	* log message, if not already there. It is not possible to send several messages
	* and have them appear on a single line in logcat.
	*
	* PLEASE USE LOGS WITH MODERATION:
	*
	* - Sending log messages eats CPU and slow down your application and the
	* system.
	*
	* - The circular log buffer is pretty small (<64KB), sending many messages
	* might push off other important log messages from the rest of the system.
	*
	* - In release builds, only send log messages to account for exceptional
	* conditions.
	*
	* NOTE: These functions MUST be implemented by /system/lib/liblog.so
	*/

	#include <stdarg.h>

	#ifdef __cplusplus
	extern "C" {
	#endif

	/*
	* Android log priority values, in ascending priority order.
	*/
	typedef enum android_LogPriority {
	ANDROID_LOG_UNKNOWN = 0,
	ANDROID_LOG_DEFAULT, /* only for SetMinPriority() */
	ANDROID_LOG_VERBOSE,
	ANDROID_LOG_DEBUG,
	ANDROID_LOG_INFO,
	ANDROID_LOG_WARN,
	ANDROID_LOG_ERROR,
	ANDROID_LOG_FATAL,
	ANDROID_LOG_SILENT, /* only for SetMinPriority(); must be last */
	} android_LogPriority;

	/*
	* Send a simple string to the log.
	*/
	int __android_log_write(int prio, const char tag, const char text);

	/*
	* Send a formatted string to the log, used like printf(fmt,...)
	*/
	int __android_log_print(int prio, const char tag, const char fmt, ...)
	#if defined(__GNUC__)
	__attribute__((__format__(printf, 3, 4)))
	#endif
	;

	/*
	* A variant of __android_log_print() that takes a va_list to list
	* additional parameters.
	*/
	int __android_log_vprint(int prio, const char *tag,
	const char *fmt, va_list ap);

	/*
	* Log an assertion failure and SIGTRAP the process to have a chance
	* to inspect it, if a debugger is attached. This uses the FATAL priority.
	*/
	void __android_log_assert(const char cond, const char tag,
	const char *fmt, ...)
	#if defined(__GNUC__)
	__attribute__((__noreturn__))
	__attribute__((__format__(printf, 3, 4)))
	#endif
	;

	#ifdef __cplusplus
	}
	#endif

	#endif /* _ANDROID_LOG_H */