tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

liblog: remove mistakenly added symbols from vndk

Browse source 
These functions and headers were all mistakenly added to the vndk.
They should not be used by vendors.

Test: these symbols do not appear in vendor libraries
Change-Id: I03919b437c2d9f0e573b7a6b40249ed12fe874b9
This commit is contained in:
Tom Cherry 2019-10-18 08:31:01 -07:00
parent 29d5de7c44
commit 5f8162b086
8 changed files with 60 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libcutils/trace-dev.inc
View file

@ -32,7 +32,6 @@
#include <cutils/properties.h>
#include <cutils/trace.h>
#include <log/log.h>
#include <log/log_properties.h>
/**
* Maximum size of a message that can be logged to the trace buffer.

18
liblog/include_vndk/log/log.h
View file

@ -1,13 +1,11 @@
/*Special log.h file for VNDK linking modules*/
#ifndef _LIBS_LOG_LOG_H
#define _LIBS_LOG_LOG_H
#pragma once
#include <android/log.h>
#include <log/log_id.h>
#include <log/log_main.h>
#include <log/log_radio.h>
#include <log/log_read.h>
#include <log/log_safetynet.h>
#include <log/log_system.h>
#include <log/log_time.h>
@ -22,4 +20,16 @@
#define LOG_TAG NULL
#endif
#endif /*_LIBS_LOG_LOG_H*/
// Legacy dependencies...
/* deal with possible sys/cdefs.h conflict with fcntl.h */
#ifdef __unused
#define __unused_defined __unused
#undef __unused
#endif
#include <fcntl.h> /* Pick up O_* macros */
/* restore definitions from above */
#ifdef __unused_defined
#define __unused __attribute__((__unused__))
#endif

15
liblog/include_vndk/log/log_event_list.h
View file

@ -16,8 +16,7 @@
/* Special log_event_list.h file for VNDK linking modules */
#ifndef _LIBS_LOG_EVENT_LIST_H
#define _LIBS_LOG_EVENT_LIST_H
#pragma once
#include <stdint.h>
@ -30,10 +29,7 @@ extern "C" {
/*
* The opaque context used to manipulate lists of events.
*/
#ifndef __android_log_context_defined
#define __android_log_context_defined
typedef struct android_log_context_internal* android_log_context;
#endif
/*
* Creates a context associated with an event tag to write elements to
@ -61,18 +57,9 @@ int android_log_write_float32(android_log_context ctx, float value);
/* NB: LOG_ID_EVENTS and LOG_ID_SECURITY only valid binary buffers */
int android_log_write_list(android_log_context ctx, log_id_t id);
/* Reset writer context */
int android_log_reset(android_log_context ctx);
/* Reset reader context */
int android_log_parser_reset(android_log_context ctx,
const char* msg, size_t len);
/* Finished with reader or writer context */
int android_log_destroy(android_log_context* ctx);
#ifdef __cplusplus
}
#endif
#endif /* _LIBS_LOG_EVENT_LIST_H */

1
liblog/include_vndk/log/log_id.h
View file

@ -1 +0,0 @@
../../include/log/log_id.h

34
liblog/include_vndk/log/log_id.h Normal file
View file

@ -0,0 +1,34 @@
/*
* Copyright (C) 2005-2017 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.
*/
#pragma once
#include <android/log.h>
#ifdef __cplusplus
extern "C" {
#endif
/*
* Send a simple string to the log.
*/
int __android_log_buf_write(int bufID, int prio, const char* tag, const char* text);
int __android_log_buf_print(int bufID, int prio, const char* tag, const char* fmt, ...)
__attribute__((__format__(printf, 4, 5)));
#ifdef __cplusplus
}
#endif

1
liblog/include_vndk/log/log_properties.h
View file

@ -1 +0,0 @@
../../include/log/log_properties.h

1
liblog/include_vndk/log/log_read.h
View file

@ -1 +0,0 @@
../../include/log/log_read.h

10
liblog/include_vndk/log/log_time.h
View file

@ -14,8 +14,7 @@
* limitations under the License.
*/
#ifndef _LIBS_LOG_LOG_TIME_H
#define _LIBS_LOG_LOG_TIME_H
#pragma once
#include <stdint.h>
@ -30,9 +29,6 @@
#define MS_PER_SEC 1000ULL
#endif
#ifndef __struct_log_time_defined
#define __struct_log_time_defined
#define LOG_TIME_SEC(t) ((t)->tv_sec)
/* next power of two after NS_PER_SEC */
#define LOG_TIME_NSEC(t) ((t)->tv_nsec & (UINT32_MAX >> 2))
@ -41,7 +37,3 @@ typedef struct log_time {
uint32_t tv_sec;
uint32_t tv_nsec;
} __attribute__((__packed__)) log_time;
#endif
#endif /* _LIBS_LOG_LOG_TIME_H */

30
liblog/liblog.map.txt
View file

@ -1,7 +1,5 @@
LIBLOG {
global:
android_name_to_log_id; # vndk
android_log_id_to_name; # vndk
__android_log_assert;
__android_log_buf_print;
__android_log_buf_write;
@ -14,25 +12,15 @@ LIBLOG {
LIBLOG_L {
global:
android_logger_clear; # vndk
android_logger_get_id; # vndk
android_logger_get_log_readable_size; # vndk
android_logger_get_log_version; # vndk
android_logger_get_log_size; # vndk
android_logger_list_alloc; # apex vndk
android_logger_list_alloc_time; # apex vndk
android_logger_list_free; # apex vndk
android_logger_list_open; # vndk
android_logger_list_read; # apex vndk
android_logger_open; # apex vndk
android_logger_set_log_size; # vndk
android_logger_list_alloc; # apex
android_logger_list_alloc_time; # apex
android_logger_list_free; # apex
android_logger_list_read; # apex
android_logger_open; # apex
};
LIBLOG_M {
global:
android_logger_get_prune_list; # vndk
android_logger_set_prune_list; # vndk
android_logger_get_statistics; # vndk
__android_log_error_write; # apex vndk
__android_log_is_loggable;
create_android_logger; # apex vndk
@ -51,7 +39,6 @@ LIBLOG_M {
LIBLOG_O {
global:
__android_log_is_loggable_len;
__android_log_is_debuggable; # vndk
};
LIBLOG_Q {
@ -61,21 +48,24 @@ LIBLOG_Q {
__android_log_bwrite; # apex
__android_log_close; # apex
__android_log_security; # apex
android_log_reset; #vndk
android_log_parser_reset; #vndk
};
LIBLOG_PRIVATE {
global:
__android_log_is_debuggable;
__android_log_pmsg_file_read;
__android_log_pmsg_file_write;
__android_log_security_bswrite;
__android_logger_get_buffer_size;
__android_logger_property_get_bool;
android_name_to_log_id;
android_openEventTagMap;
android_logger_list_open;
android_log_id_to_name;
android_log_processBinaryLogBuffer;
android_log_processLogBuffer;
android_log_read_next;
android_log_reset;
android_log_write_list_buffer;
android_lookupEventTagNum;
create_android_log_parser;