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

Commit 84255160 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I249a460c,I66c4be74 

* changes:
  Mock static initialization order 08
  Mock static initialization order 07
parents 1c6ce73c 3440a906

system/stack/test/common/mock_stack_avdt_msg.cc

+1 −2
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ 


#include "stack/avdt/avdt_int.h"

#include "stack/include/bt_hdr.h"



extern std::map<std::string, int> mock_function_count_map;

#include "test/common/mock_functions.h"



/*

 * TODO: This way of mocking is primitive.

system/test/mock/mock_bta_ag_api.cc

+3 −5
Original line number Diff line number Diff line
@@ -19,20 +19,18 @@ 
 *   Functions generated:14

 */



#include <map>

#include <string>



extern std::map<std::string, int> mock_function_count_map;



#include <base/functional/bind.h>

#include <base/location.h>



#include <cstdint>

#include <cstring>

#include <map>

#include <string>

#include <vector>



#include "bta/ag/bta_ag_int.h"

#include "bta/include/bta_ag_api.h"

#include "test/common/mock_functions.h"

#include "types/raw_address.h"



#ifndef UNUSED_ATTR

system/test/mock/mock_bta_ar.cc

+2 −4
Original line number Diff line number Diff line
@@ -19,17 +19,15 @@ 
 *   Functions generated:8

 */



#include <cstdint>

#include <map>

#include <string>



extern std::map<std::string, int> mock_function_count_map;



#include <cstdint>



#include "bta/ar/bta_ar_int.h"

#include "bta/sys/bta_sys.h"

#include "stack/include/avct_api.h"

#include "stack/include/avrc_api.h"

#include "test/common/mock_functions.h"

#include "types/raw_address.h"



#ifndef UNUSED_ATTR

system/test/mock/mock_bta_av_api.cc

+1 −2
Original line number Diff line number Diff line
@@ -22,14 +22,13 @@ 
#include <map>

#include <string>



extern std::map<std::string, int> mock_function_count_map;



#include "bt_target.h"

#include "bta/av/bta_av_int.h"

#include "osi/include/allocator.h"

#include "osi/include/compat.h"

#include "osi/include/log.h"

#include "stack/include/bt_hdr.h"

#include "test/common/mock_functions.h"

#include "types/raw_address.h"



#ifndef UNUSED_ATTR

system/test/mock/mock_bta_av_ci.cc

+1 −2
Original line number Diff line number Diff line
@@ -22,11 +22,10 @@ 
#include <map>

#include <string>



extern std::map<std::string, int> mock_function_count_map;



#include "bta/av/bta_av_int.h"

#include "osi/include/allocator.h"

#include "osi/include/log.h"

#include "test/common/mock_functions.h"



#ifndef UNUSED_ATTR

#define UNUSED_ATTR