From bdac221cc3e87f0c1779f22df45f8efb3c610ffc Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Wed, 21 Dec 2016 23:15:24 +0000 Subject: [PATCH] Revert "Continue using the legacy NDK android/log.h." Use refreshed android/log.h for NDK This effectively a modern revert of the commit b7c3996f7c048eac6f113697a5734870f0b2cfdb Test: build Bug: 30465923 Bug: 34250038 Change-Id: I7d4a5134bb711051283c36a2d5bc803436dca12e --- include/android | 1 - include/android/log.h | 1 + liblog/Android.bp | 12 +-- liblog/legacy-ndk-includes/log.h | 128 ------------------------------- 4 files changed, 3 insertions(+), 139 deletions(-) delete mode 120000 include/android create mode 120000 include/android/log.h delete mode 100644 liblog/legacy-ndk-includes/log.h diff --git a/include/android b/include/android deleted file mode 120000 index 487239387..000000000 --- a/include/android +++ /dev/null @@ -1 +0,0 @@ -../liblog/include/android \ No newline at end of file diff --git a/include/android/log.h b/include/android/log.h new file mode 120000 index 000000000..736c44840 --- /dev/null +++ b/include/android/log.h @@ -0,0 +1 @@ +../../liblog/include/android/log.h \ No newline at end of file diff --git a/liblog/Android.bp b/liblog/Android.bp index dce316d6d..747fcc8dc 100644 --- a/liblog/Android.bp +++ b/liblog/Android.bp @@ -97,19 +97,11 @@ cc_library { 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 { name: "liblog_headers", - from: "legacy-ndk-includes", + from: "include/android", to: "android", - srcs: ["legacy-ndk-includes/log.h"], + srcs: ["include/android/log.h"], license: "NOTICE", } diff --git a/liblog/legacy-ndk-includes/log.h b/liblog/legacy-ndk-includes/log.h deleted file mode 100644 index d40d6fa9a..000000000 --- a/liblog/legacy-ndk-includes/log.h +++ /dev/null @@ -1,128 +0,0 @@ -/* - * 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 - -#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 */