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

Commit 2156a173 authored by Sadiq Sada's avatar Sadiq Sada Committed by Gerrit Code Review
Browse files

Revert "Use one definition for Octet16" 

This reverts commit 9402f317.

Reason for revert: Build failure b/308624962

Change-Id: I3ac63565c9b2d8545b0154272f7276673d2e454e
parent 9402f317

system/bta/ag/bta_ag_cfg.cc

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include "device/include/esco_parameters.h"

#include "osi/include/allocator.h"

#include "osi/include/compat.h"

#include "stack/include/bt_types.h"



#ifndef BTA_AG_CIND_INFO

#define BTA_AG_CIND_INFO                                                       \

system/bta/dm/bta_dm_main.cc

+2 −1
Original line number Diff line number Diff line
@@ -26,14 +26,15 @@ 


#include "bt_trace.h"

#include "bta/dm/bta_dm_disc.h"

#include "bta/dm/bta_dm_sec_int.h"

#include "bta/dm/bta_dm_gatt_client.h"

#include "bta/dm/bta_dm_int.h"

#include "bta/dm/bta_dm_sec_int.h"

#include "gd/common/circular_buffer.h"

#include "gd/common/strings.h"

#include "main/shim/dumpsys.h"

#include "stack/btm/btm_int_types.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_types.h"



tBTA_DM_ACL_CB bta_dm_acl_cb;

tBTA_DM_CB bta_dm_cb;

system/bta/gatt/bta_gatts_int.h

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "bta/include/bta_gatt_api.h"

#include "bta/sys/bta_sys.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_types.h"

#include "stack/include/btm_ble_api_types.h"

#include "stack/include/gatt_api.h"

#include "types/bluetooth/uuid.h"

system/bta/gatt/database.cc

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <sstream>



#include "bt_trace.h"

#include "bt_types.h"

#include "stack/crypto_toolbox/crypto_toolbox.h"

#include "stack/include/gattdefs.h"

#include "types/bluetooth/uuid.h"

system/bta/gatt/database.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <utility>

#include <vector>



#include "stack/include/bt_octets.h"

#include "stack/include/bt_types.h" /* for Octet16 */

#include "types/bluetooth/uuid.h"



namespace gatt {