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

Commit b084b2d6 authored by Marie Janssen's avatar Marie Janssen Committed by Android Git Automerger
Browse files

am 721624d1: build: fixes for breakages on tilapia 

* commit '721624d1':
  build: fixes for breakages on tilapia
parents beb7fe1f 721624d1

system/btif/include/btif_gatt_multi_adv_util.h

+6 −7
Original line number Diff line number Diff line
@@ -16,11 +16,10 @@ 
 *

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





#ifndef BTIF_GATT_MULTI_ADV_UTIL_H

#define BTIF_GATT_MULTI_ADV_UTIL_H

#pragma once



#include <hardware/bluetooth.h>



#include "bta_api.h"



#define CLNT_IF_IDX 0
@@ -50,6 +49,7 @@ typedef struct 
    uint8_t* p_service_uuid;

} btif_adv_data_t;





typedef struct

{

    BOOLEAN is_scan_rsp;
@@ -71,6 +71,7 @@ typedef struct 
} btgatt_multi_adv_common_data;



extern btgatt_multi_adv_common_data *btif_obtain_multi_adv_data_cb();



extern void btif_gattc_incr_app_count(void);

extern void btif_gattc_decr_app_count(void);

extern int btif_multi_adv_add_instid_map(int client_if, int inst_id,
@@ -92,6 +93,4 @@ extern void btif_gattc_adv_data_packager(int client_if, bool set_scan_rsp, 
                char* service_uuid, btif_adv_data_t *p_multi_adv_inst);

extern void btif_gattc_adv_data_cleanup(const btif_adv_data_t* adv);

void btif_multi_adv_timer_ctrl(int client_if, TIMER_CBACK cb);

#endif

system/btif/include/btif_hl.h

+3 −1
Original line number Diff line number Diff line
@@ -19,8 +19,10 @@ 
#ifndef BTIF_HL_H

#define BTIF_HL_H



#include "bt_types.h"

#include <hardware/bluetooth.h>



#include "bta_hl_api.h"

#include "gki.h"



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

**  Constants & Macros

system/btif/src/btif_gatt_multi_adv_util.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 


#define LOG_TAG "bt_btif_gatt"



#include "btif_gatt_multi_adv_util.h"



#include <stdio.h>

#include <stdlib.h>
@@ -41,6 +40,7 @@ 


#include "bta_gatt_api.h"

#include "btif_common.h"

#include "btif_gatt_multi_adv_util.h"

#include "btif_gatt_util.h"



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

system/btif/src/btif_hl.c

+0 −3
Original line number Diff line number Diff line
@@ -46,16 +46,13 @@ 
#include <time.h>

#include <unistd.h>



#include <hardware/bluetooth.h>

#include <hardware/bt_hl.h>



#include "bta_api.h"

#include "bta_hl_api.h"

#include "btif_common.h"

#include "btif_storage.h"

#include "btif_util.h"

#include "btu.h"

#include "gki.h"

#include "mca_api.h"

#include "osi/include/list.h"

#include "osi/include/log.h"