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

Commit a166708d authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

liblog: logcat: Replace log/logd.h with log/log.h 

Should use log/log.h and in some cases android/log.h instead. Can
not remove file because still in use by partners, so log/logd.h
points to log/log.h.

Test: Compile
Bug: 26552300
Bug: 31289077
Change-Id: I3580d46154617abb7231027a44f4ab9ee023febf
parent 004cd3c5

include/log/log.h

+10 −1
Original line number Diff line number Diff line
@@ -29,12 +29,13 @@ 
#define _LIBS_LOG_LOG_H



#include <stdarg.h>

#include <stdint.h>

#include <stdio.h>

#include <sys/types.h>

#include <time.h>

#include <unistd.h>



#include <log/logd.h>

#include <android/log.h>

#include <log/uio.h>



#ifdef __cplusplus
@@ -50,6 +51,14 @@ extern "C" { 
#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"

#endif



int __android_log_bwrite(int32_t tag, const void *payload, size_t len);

int __android_log_btwrite(int32_t tag, char type, const void *payload,

    size_t len);

int __android_log_bswrite(int32_t tag, const char *payload);



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);



// ---------------------------------------------------------------------



/*

include/log/logd.h

+1 −54
Original line number 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_CUTILS_LOGD_H

#define _ANDROID_CUTILS_LOGD_H



/* the stable/frozen log-related definitions have been

 * moved to this header, which is exposed by the NDK

 */

#include <android/log.h>



/* the rest is only used internally by the system */

#if !defined(_WIN32)

#include <pthread.h>

#endif

#include <stdarg.h>

#include <stdint.h>

#include <stdio.h>

#include <sys/types.h>

#include <time.h>

#include <unistd.h>



#include <log/uio.h>



#ifdef __cplusplus

extern "C" {

#endif



int __android_log_bwrite(int32_t tag, const void *payload, size_t len);

int __android_log_btwrite(int32_t tag, char type, const void *payload,

    size_t len);

int __android_log_bswrite(int32_t tag, const char *payload);



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);



#ifdef __cplusplus

}

#endif



#endif /* _LOGD_H */
 
#include <log/log.h>

liblog/fake_log_device.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <stdlib.h>

#include <string.h>



#include <log/logd.h>

#include <log/log.h>



#include "fake_log_device.h"

#include "log_portability.h"

liblog/logd_reader.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include <unistd.h>



#include <cutils/sockets.h>

#include <log/logd.h>

#include <log/log.h>

#include <log/logger.h>

#include <private/android_filesystem_config.h>

#include <private/android_logger.h>

liblog/logd_writer.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include <unistd.h>



#include <cutils/sockets.h>

#include <log/logd.h>

#include <log/log.h>

#include <log/logger.h>

#include <private/android_filesystem_config.h>

#include <private/android_logger.h>