diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-04-18 14:46:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-04-18 14:46:27 +0000 |
| commit | f358bed6248926bf98f3493ec7f5ffa6b5671e1b (patch) | |
| tree | 37ca4aff7d2c01f6e23b29f2d30123d86b4bdef3 /liblog/include | |
| parent | 6ad16cda199089ccb7c8d5e6e6a993a9d2fa5d0a (diff) | |
| parent | d73be1b96beab812b86f8174e7fc928291f0cb44 (diff) | |
| download | system_core-f358bed6248926bf98f3493ec7f5ffa6b5671e1b.tar.gz system_core-f358bed6248926bf98f3493ec7f5ffa6b5671e1b.tar.bz2 system_core-f358bed6248926bf98f3493ec7f5ffa6b5671e1b.zip | |
Merge "libcutils: compile with BOARD_VNDK_VERSION current"
Diffstat (limited to 'liblog/include')
| -rw-r--r-- | liblog/include/log/log_properties.h | 35 | ||||
| -rw-r--r-- | liblog/include/private/android_logger.h | 2 |
2 files changed, 35 insertions, 2 deletions
diff --git a/liblog/include/log/log_properties.h b/liblog/include/log/log_properties.h new file mode 100644 index 000000000..7d398a6b4 --- /dev/null +++ b/liblog/include/log/log_properties.h @@ -0,0 +1,35 @@ +/* +** +** Copyright 2017, 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 +** General Public License. +*/ + +#ifndef _LIBS_LOG_PROPERTIES_H +#define _LIBS_LOG_PROPERTIES_H + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef __ANDROID_USE_LIBLOG_IS_DEBUGGABLE_INTERFACE +#ifndef __ANDROID_API__ +#define __ANDROID_USE_LIBLOG_IS_DEBUGGABLE_INTERFACE 1 +#elif __ANDROID_API__ > 24 /* > Nougat */ +#define __ANDROID_USE_LIBLOG_IS_DEBUGGABLE_INTERFACE 1 +#else +#define __ANDROID_USE_LIBLOG_IS_DEBUGGABLE_INTERFACE 0 +#endif +#endif + +#if __ANDROID_USE_LIBLOG_IS_DEBUGGABLE_INTERFACE +int __android_log_is_debuggable(); +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* _LIBS_LOG_PROPERTIES_H */ diff --git a/liblog/include/private/android_logger.h b/liblog/include/private/android_logger.h index e3ccfcff2..965de375c 100644 --- a/liblog/include/private/android_logger.h +++ b/liblog/include/private/android_logger.h @@ -135,8 +135,6 @@ int __android_log_security_bwrite(int32_t tag, const void* payload, size_t len); int __android_log_security_bswrite(int32_t tag, const char* payload); int __android_log_security(); /* Device Owner is present */ -int __android_log_is_debuggable(); - #define BOOL_DEFAULT_FLAG_TRUE_FALSE 0x1 #define BOOL_DEFAULT_FALSE 0x0 /* false if property not present */ #define BOOL_DEFAULT_TRUE 0x1 /* true if property not present */ |