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

Commit c156360b authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge changes I27ee2b57,Id24311c1 

* changes:
  Mock static initialization order 10
  Mock static initialization order 09
parents 84255160 67dfbd6a

system/test/mock/mock_a2dp_api.cc

+3 −4
Original line number Diff line number Diff line
@@ -19,19 +19,18 @@ 
 *   Functions generated:9

 */



#include <string.h>



#include <map>

#include <string>



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



#include <string.h>



#include "a2dp_api.h"

#include "a2dp_int.h"

#include "avdt_api.h"

#include "bt_target.h"

#include "osi/include/log.h"

#include "sdpdefs.h"

#include "test/common/mock_functions.h"

#include "types/raw_address.h"



#ifndef UNUSED_ATTR

system/test/mock/mock_a2dp_codec_config.cc

+4 −5
Original line number Diff line number Diff line
@@ -19,14 +19,12 @@ 
 *   Functions generated:67

 */



#include <map>

#include <string>



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



#include <base/logging.h>

#include <inttypes.h>



#include <map>

#include <string>



#include "a2dp_aac.h"

#include "a2dp_codec_api.h"

#include "a2dp_sbc.h"
@@ -35,6 +33,7 @@ extern std::map<std::string, int> mock_function_count_map; 
#include "osi/include/log.h"

#include "osi/include/properties.h"

#include "stack/include/bt_hdr.h"

#include "test/common/mock_functions.h"



#ifndef UNUSED_ATTR

#define UNUSED_ATTR

system/test/mock/mock_btcore_module.cc

+0 −2
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ 
#include <map>

#include <string>



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



// Mock include file to share data between tests and mock

#include "test/mock/mock_btcore_module.h"

system/test/mock/mock_btcore_module.h

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

#include <string>



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

#include "test/common/mock_functions.h"



// Original included files, if any

// NOTE: Since this is a mock file with mock definitions some number of

system/test/mock/mock_btif_avrcp_service.cc

+0 −2
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 
#include <map>

#include <string>



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



// Mock include file to share data between tests and mock

#include "test/mock/mock_btif_avrcp_service.h"