Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fc8c655 authored by Tom Cherry's avatar Tom Cherry Committed by android-build-merger
Browse files

Merge "liblog: remove mistakenly added symbols from vndk" am: cc4bf653 am: 7e6ef652 

am: b3f286ff

Change-Id: Id357b1752f3e0abc662403fa7e54d0ff9f0e754c
parents 2964c841 b3f286ff

libcutils/trace-dev.inc

+0 −1
Original line number Diff line number Diff line
@@ -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.

liblog/include_vndk/log/log.h

+14 −4
Original line number Diff line number Diff line 
/*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

liblog/include_vndk/log/log_event_list.h

+1 −14
Original line number Diff line number Diff line
@@ -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 */

liblog/include_vndk/log/log_id.h

deleted120000 → 0
+34 −1
Original line number Diff line number Diff line 
../../include/log/log_id.h
 
 No newline at end of file

liblog/include_vndk/log/log_id.h

0 → 100644
+34 −1
Original line number Diff line number Diff line 
/*

 * 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