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

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

Merge "legacy: Explicitly include or uninclude bt_trace" am: aee68cad am:... 

Merge "legacy: Explicitly include or uninclude bt_trace" am: aee68cad am: 5866c276 am: fb07eb22 am: d77c972b

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

Change-Id: I4751d950525f6345179f0519bd2172509ba5c48d
parents 4216aae9 d77c972b

system/stack/test/fuzzers/a2dp/a2dpFuzzHelpers.h

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <fuzzer/FuzzedDataProvider.h>

#include <vector>

#include "bt_target.h"

#include "bt_trace.h"

#include "fuzzers/sdp/sdpFuzzHelpers.h"

#include "osi/include/allocator.h"

#include "stack/a2dp/a2dp_int.h"

system/stack/test/rfcomm/stack_rfcomm_test_main.cc

+1 −3
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 


#include <string>



#include "bt_trace.h"



// Override LogMsg method so that we can output log via VLOG(1)

extern "C" void LogMsg(uint32_t trace_set_mask, const char* fmt_str, ...) {

  char buffer[256];

system/test/mock/mock_bta_hf_client_api.cc

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
extern std::map<std::string, int> mock_function_count_map;



#include <cstdint>

#include "bt_trace.h"

#include "bta/hf_client/bta_hf_client_int.h"

#include "bta/include/bta_hf_client_api.h"

#include "bta/sys/bta_sys.h"

system/test/mock/mock_bta_hh_utils.h

+1 −2
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ extern std::map<std::string, int> mock_function_count_map; 
#include <cstring>



#include "bt_target.h"

#include "bt_trace.h"

#include "bta/hh/bta_hh_int.h"

#include "btif/include/btif_storage.h"

#include "device/include/interop.h"

system/test/mock/mock_common_address_obfuscator.cc

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ extern std::map<std::string, int> mock_function_count_map; 
#include <base/logging.h>

#include <openssl/hmac.h>

#include <algorithm>

#include "bt_trace.h"

#include "common/address_obfuscator.h"



#ifndef UNUSED_ATTR