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

Commit 2c758176 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Fix errors around logging when compiling on Linux 

am: ba5fc8e3

Change-Id: I88127a850a6eaa9cf8a390964cf89d7839d37ad8
parents 1cc5c689 ba5fc8e3

system/btif/src/btif_hf.cc

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <hardware/bluetooth_headset_callbacks.h>

#include <hardware/bluetooth_headset_interface.h>

#include <hardware/bt_hf.h>

#include <log/log.h>



#include "bta/include/utl.h"

#include "bta_ag_api.h"

system/linux_include/log/log.h

+8 −1
Original line number Diff line number Diff line
@@ -15,12 +15,19 @@ 
 *  limitations under the License.

 *

 ******************************************************************************/

#pragma once



/* This file provides empty implementation of android_errorWriteLog, which is

 * not required on linux. It should be on include path only for linux build. */



#if defined(OS_GENERIC)



inline int android_errorWriteLog(int, const char*) { return 0; };

#include <cstdint>



inline int android_errorWriteLog(int, const char*) { return 0; };

inline int android_errorWriteWithInfoLog(int tag, const char* subTag,

                                         int32_t uid, const char* data,

                                         uint32_t dataLen) {

  return 0;

};

#endif

system/osi/src/config.cc

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
 ******************************************************************************/



#include "osi/include/config.h"

#include "log/log.h"



#include <base/files/file_path.h>

#include <base/logging.h>
@@ -25,6 +24,7 @@ 
#include <errno.h>

#include <fcntl.h>

#include <libgen.h>

#include <log/log.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

system/stack/bnep/bnep_utils.cc

+2 −2
Original line number Diff line number Diff line
@@ -22,10 +22,10 @@ 
 *

 ******************************************************************************/



#include <cutils/log.h>



#include <log/log.h>

#include <stdio.h>

#include <string.h>



#include "bnep_int.h"

#include "bt_common.h"

#include "bt_types.h"

system/stack/gatt/gatt_sr.cc

+2 −1
Original line number Diff line number Diff line
@@ -22,12 +22,13 @@ 
 *

 ******************************************************************************/



#include <log/log.h>

#include "bt_target.h"

#include "bt_utils.h"

#include "osi/include/osi.h"



#include <log/log.h>

#include <string.h>



#include "gatt_int.h"

#include "l2c_api.h"

#include "l2c_int.h"