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

Commit a3a1df38 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "legacy: hci: Properly include stack/include/bt_hdr" am: 360c916b am:... 

Merge "legacy: hci: Properly include stack/include/bt_hdr" am: 360c916b am: e3449ba4 am: 894409f8 am: b476c508 am: 1c61f9ba

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1831597

Change-Id: Ic0a8c0ac939006deaec760aa2b09e2e016b573e8
parents 1e7098b5 1c61f9ba

system/hci/include/hci_layer.h

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


#include "osi/include/future.h"

#include "osi/include/osi.h"  // INVALID_FD

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_types.h"



///// LEGACY DEFINITIONS /////

system/hci/src/hci_packet_parser.cc

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "hci/include/buffer_allocator.h"

#include "hci_layer.h"

#include "osi/include/log.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/hcidefs.h"



static const command_opcode_t NO_OPCODE_CHECKING = 0;

system/hci/src/packet_fragmenter.cc

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 


#include <base/logging.h>

#include <string.h>



#include <unordered_map>



#include "bt_target.h"
@@ -30,6 +31,7 @@ 
#include "hci/include/buffer_allocator.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "stack/include/bt_hdr.h"



// 2 bytes for handle, 2 bytes for data length (Volume 2, Part E, 5.4.2)

#define HCI_ACL_PREAMBLE_SIZE 4

system/hci/test/packet_fragmenter_host_test.cc

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "hci/src/packet_fragmenter.cc"

#include "osi/include/allocator.h"

#include "osi/test/AllocationTestHarness.h"

#include "stack/include/bt_hdr.h"



extern void allocation_tracker_uninit(void);

system/hci/test/packet_fragmenter_test.cc

+4 −4
Original line number Diff line number Diff line
@@ -16,16 +16,16 @@ 
 *

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



#include <gtest/gtest.h>



#include "AllocationTestHarness.h"

#include "hci/include/packet_fragmenter.h"



#include <gtest/gtest.h>

#include <stdint.h>



#include "AllocationTestHarness.h"

#include "device/include/controller.h"

#include "hci/include/packet_fragmenter.h"

#include "osi/include/allocator.h"

#include "osi/include/osi.h"

#include "stack/include/bt_hdr.h"

#include "test_stubs.h"



#ifndef HCI_ACL_PREAMBLE_SIZE