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

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

Merge "legacy: Re-include stack/test mocks" am: 5f328b53 am: de31abf1 am:... 

Merge "legacy: Re-include stack/test mocks" am: 5f328b53 am: de31abf1 am: eb85ffd9 am: 0f85e767

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

Change-Id: I25d492381ab32b2c779e6a3acf5f478834b8b317
parents f623dd2a 0f85e767

system/stack/test/common/mock_btm_layer.h

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


#include <gmock/gmock.h>



#include "btm_int.h"

#include "stack/include/btm_api_types.h"

#include "stack/include/btm_status.h"

#include "types/raw_address.h"

system/stack/test/common/stack_test_packet_utils.cc

+6 −5
Original line number Diff line number Diff line
@@ -16,12 +16,13 @@ 
 *

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



#include "hci_layer.h"

#include "l2c_api.h"

#include "osi/include/allocator.h"



#include "stack_test_packet_utils.h"



#include "hci/include/hci_layer.h"

#include "osi/include/allocator.h"

#include "stack/include/l2c_api.h"

#include "stack/include/l2cdefs.h"



namespace bluetooth {



std::vector<uint8_t> CreateL2capDataPacket(uint16_t lcid,

system/stack/test/common/stack_test_packet_utils.h

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

#pragma once



#include <vector>

#include "stack/include/bt_hdr.h"



namespace bluetooth {

system/stack/test/fuzzers/common/commonFuzzHelpers.h

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
#include <fuzzer/FuzzedDataProvider.h>

#include <cstring>  // For memcpy

#include <vector>

#include "raw_address.h"

#include "sdp_api.h"

#include "stack/include/sdp_api.h"

#include "types/raw_address.h"



// Calls a function from the ops_vector

void callArbitraryFunction(

system/stack/test/fuzzers/sdp/sdpFuzzFunctions.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <vector>

#include "fuzzers/common/commonFuzzHelpers.h"

#include "fuzzers/sdp/sdpFuzzHelpers.h"

#include "sdp_api.h"

#include "stack/include/sdp_api.h"



#define SDP_MAX_DB_LEN 1024 * 1024  // 1 MB

#define MAX_NUM_DBS 64