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

Commit c1a12a05 authored by Marie Janssen's avatar Marie Janssen
Browse files

build: Fix LOG_TAG define breakage, macro usage 

Fixes build breakages related to r.android.com/156982

Change-Id: Ib1143c41fe05a17c296226998afdb41a8cb6294a
parent fc8006e6

system/audio_a2dp_hw/audio_a2dp_hw.c

+2 −2
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
 *

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



#define LOG_TAG "bt_a2dp_hw"



#include <errno.h>

#include <fcntl.h>

#include <inttypes.h>
@@ -56,8 +58,6 @@ 


#define CASE_RETURN_STR(const) case const: return #const;



#define LOG_TAG "bt_a2dp_hw"



#define FNLOG()             LOG_VERBOSE(LOG_TAG, "%s", __FUNCTION__);

#define DEBUG(fmt, ...)     LOG_VERBOSE(LOG_TAG, "%s: " fmt,__FUNCTION__, ## __VA_ARGS__)

#define INFO(fmt, ...)      LOG_INFO(LOG_TAG, "%s: " fmt,__FUNCTION__, ## __VA_ARGS__)

system/bta/av/bta_av_main.c

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

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



#define LOG_TAG "bta_av"



#include <assert.h>

#include <string.h>
@@ -43,8 +45,6 @@ 
** Constants and types

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



#define LOG_TAG "bta_av"



/* AVDTP protocol timeout values */

#define BTIF_AVK_SERVICE_NAME "Advanced Audio Sink"

system/bta/dm/bta_dm_act.c

+2 −2
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
 *

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



#define LOG_TAG "bt_bta_dm"



#include <string.h>



#include "bt_target.h"
@@ -46,8 +48,6 @@ 
#include "gap_api.h"

#endif



#define LOG_TAG "bt_bta_dm"



static void bta_dm_inq_results_cb (tBTM_INQ_RESULTS *p_inq, UINT8 *p_eir);

static void bta_dm_inq_cmpl_cb (void * p_result);

static void bta_dm_service_search_remname_cback (BD_ADDR bd_addr, DEV_CLASS dc, BD_NAME bd_name);

system/bta/gatt/bta_gattc_act.c

+2 −2
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
 *

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



#define LOG_TAG "bt_bta_gattc"



#include <string.h>



#include "bt_target.h"
@@ -39,8 +41,6 @@ 
#include "bta_hh_int.h"

#endif



#define LOG_TAG "bt_bta_gattc"



#if BTA_GATT_INCLUDED && BLE_INCLUDED == TRUE



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

system/bta/gatt/bta_gattc_cache.c

+2 −2
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
 *

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



#define LOG_TAG "bt_bta_gattc"



#include "bt_target.h"



#if defined(BTA_GATT_INCLUDED) && (BTA_GATT_INCLUDED == TRUE)
@@ -44,8 +46,6 @@ static tBTA_GATT_STATUS bta_gattc_sdp_service_disc(UINT16 conn_id, tBTA_GATTC_SE 


#define BTA_GATT_SDP_DB_SIZE 4096



#define LOG_TAG "bt_bta_gattc"



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

**  Constants

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